October 2013 - Wine-commits

Alistair Leslie-Hughes : include: Add more CLR_E_SHIM defines.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 57f5e14196567281ef46b08be0c222df992312e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f5e14196567281ef46b08be… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 28 11:32:47 2013 +1100 include: Add more CLR_E_SHIM defines. --- include/corerror.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/corerror.h b/include/corerror.h index 3ddfe47..6419ea1 100644 --- a/include/corerror.h +++ b/include/corerror.h @@ -126,5 +126,9 @@ #define CLR_E_SHIM_RUNTIME EMAKEHR(0x1700) #define CLR_E_SHIM_RUNTIMEEXPORT EMAKEHR(0x1701) +#define CLR_E_SHIM_INSTALLROOT EMAKEHR(0x1702) +#define CLR_E_SHIM_INSTALLCOMP EMAKEHR(0x1703) +#define CLR_E_SHIM_LEGACYRUNTIMEALREADYBOUND EMAKEHR(0x1704) +#define CLR_E_SHIM_SHUTDOWNINPROGRESS EMAKEHR(0x1705) -#endif /* __WINE_CORERROR_H */ +#endif /* __WINE_CORERROR_H */

1 0

Alexandre Julliard : makefiles: Generate explicit build rules for C source files from makedep.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 3571c0679918eb008ad0fde52cee9bd06eba75c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3571c0679918eb008ad0fde52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 11:16:11 2013 +0100 makefiles: Generate explicit build rules for C source files from makedep. --- Make.rules.in | 1 + libs/wine/Makefile.in | 25 ++++++++++--------------- tools/makedep.c | 23 ++++++++++++++++++++--- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 94c2e83..2c0f965 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -33,6 +33,7 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) +ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Implicit rules diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 24635c1..b958484 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,6 +1,13 @@ DLLFLAGS = @DLLFLAGS@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ -EXTRADEFS = -DWINE_UNICODE_API="" +EXTRADEFS = -DWINE_UNICODE_API="" \ + -DBINDIR='"$(bindir)"' \ + -DDLLDIR='"$(dlldir)"' \ + -DDLLPREFIX='"$(DLLPREFIX)"' \ + -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \ + -DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \ + -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \ + -DBIN_TO_DATADIR=\"`$(RELPATH) $(bindir) $(datadir)/wine`\" STATICLIB = libwine_static.a VERSION = 1.0 @@ -103,23 +110,11 @@ EXTRA_OBJS = version.o @MAKE_RULES@ -# Special defines needed for config.c - -CONFIGDIRS = \ - -DBINDIR='"$(bindir)"' \ - -DDLLDIR='"$(dlldir)"' \ - -DDLLPREFIX='"$(DLLPREFIX)"' \ - -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \ - -DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \ - -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \ - -DBIN_TO_DATADIR=\"`$(RELPATH) $(bindir) $(datadir)/wine`\" - -config.o: config.c $(RELPATH) - $(CC) -c $(ALLCFLAGS) -o $@ $(srcdir)/config.c $(CONFIGDIRS) - version.c: dummy version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) +$(OBJS): $(RELPATH) + $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) diff --git a/tools/makedep.c b/tools/makedep.c index 982d827..466066e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -981,14 +981,18 @@ static void output_sources(void) else output( "%s.tab.c: %s\n", obj, source->filename ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); - column += output( "%s.tab.o: %s.tab.c", obj, obj ); + output( "%s.tab.o: %s.tab.c\n", obj, obj ); + output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s.tab.c\n", obj ); + column += output( "%s.tab.o:", obj ); free( header ); } else if (!strcmp( ext, "l" )) /* lex file */ { output( "%s.yy.c: %s\n", obj, source->filename ); output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); - column += output( "%s.yy.o: %s.yy.c", obj, obj ); + output( "%s.yy.o: %s.yy.c\n", obj, obj ); + output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s.yy.c\n", obj ); + column += output( "%s.yy.o:", obj ); } else if (!strcmp( ext, "rc" )) /* resource file */ { @@ -1069,8 +1073,21 @@ static void output_sources(void) { struct object_extension *ext; LIST_FOR_EACH_ENTRY( ext, &object_extensions, struct object_extension, entry ) + { + if (strstr( ext->extension, "cross" )) + { + output( "%s.%s: %s\n", obj, ext->extension, source->filename ); + output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); + } + else + { + output( "%s.%s: %s\n", obj, ext->extension, source->filename ); + output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s\n", source->filename ); + } + } + LIST_FOR_EACH_ENTRY( ext, &object_extensions, struct object_extension, entry ) column += output( "%s.%s ", obj, ext->extension ); - column += output( ": %s", source->filename ); + column += output( ":" ); } free( obj );

1 0

Alexandre Julliard : makefiles: Expand srcdir directly into the top-level makefile.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 0dcc1cc3e84accf8f470923e055812aa41cb5353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcc1cc3e84accf8f470923e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 11:44:59 2013 +0100 makefiles: Expand srcdir directly into the top-level makefile. --- aclocal.m4 | 8 ++++---- configure | 25 +++++++++++++------------ configure.ac | 17 +++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 66228f4..14b6f53 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -433,7 +433,7 @@ $ac_dir/uninstall:: "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT .PHONY: $ac_dir/install-dev $ac_dir/uninstall @@ -466,9 +466,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec $ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec .PHONY: $ac_dir/install-dev $ac_dir/uninstall $ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT @@ -481,7 +481,7 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a $ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec" + \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec" fi if test "$ac_name" != "$ac_implib" diff --git a/configure b/configure index 0e49525..103800d 100755 --- a/configure +++ b/configure @@ -5834,6 +5834,7 @@ then MAINTAINER_MODE=\# else + test "$srcdir" = . || as_fn_error $? "Maintainer mode cannot work out of tree." "$LINENO" 5 if test "$FONTFORGE" = "false"; then as_fn_error $? "You need fontforge to rebuild fonts in maintainer mode." "$LINENO" 5; fi if test "$RSVG" = "false"; then as_fn_error $? "You need rsvg to rebuild icons in maintainer mode." "$LINENO" 5; fi @@ -16350,7 +16351,7 @@ fi "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT .PHONY: $ac_dir/install-dev $ac_dir/uninstall @@ -16383,9 +16384,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec $ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec .PHONY: $ac_dir/install-dev $ac_dir/uninstall $ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT @@ -16398,7 +16399,7 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a $ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) - \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec" + \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec" fi if test "$ac_name" != "$ac_implib" @@ -17419,11 +17420,11 @@ ac_config_files="$ac_config_files Make.tmp:Make.vars.in:Makefile.in" if test "x$enable_maintainer_mode" = xyes then - wine_fn_append_rule "\$(srcdir)/configure: configure.ac aclocal.m4 - cd \$(srcdir) && autoconf --warnings=all -\$(srcdir)/include/config.h.in: include/stamp-h.in -\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 - cd \$(srcdir) && autoheader --warnings=all + wine_fn_append_rule "configure: configure.ac aclocal.m4 + autoconf --warnings=all +include/config.h.in: include/stamp-h.in +include/stamp-h.in: configure.ac aclocal.m4 + autoheader --warnings=all @echo timestamp > \$@" fi @@ -17431,9 +17432,9 @@ if test "x$with_gettextpo" = xyes then test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5 wine_fn_append_rule "ALL_POT_FILES =$ALL_POT_FILES -\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot - msgmerge --previous -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ -\$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) +\$(LINGUAS:%=po/%.po): po/wine.pot + msgmerge --previous -q \$@ po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ +po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$@ \$(ALL_POT_FILES)" fi diff --git a/configure.ac b/configure.ac index 4f6e263..b3d47dd 100644 --- a/configure.ac +++ b/configure.ac @@ -280,6 +280,7 @@ if test "x$enable_maintainer_mode" != "xyes" then AC_SUBST([MAINTAINER_MODE],[\#]) else + test "$srcdir" = . || AC_MSG_ERROR([Maintainer mode cannot work out of tree.]) if test "$FONTFORGE" = "false"; then AC_MSG_ERROR([You need fontforge to rebuild fonts in maintainer mode.]); fi if test "$RSVG" = "false"; then AC_MSG_ERROR([You need rsvg to rebuild icons in maintainer mode.]); fi @@ -3462,11 +3463,11 @@ dnl Some final makefile rules if test "x$enable_maintainer_mode" = xyes then WINE_APPEND_RULE( -[\$(srcdir)/configure: configure.ac aclocal.m4 - cd \$(srcdir) && autoconf --warnings=all -\$(srcdir)/include/config.h.in: include/stamp-h.in -\$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 - cd \$(srcdir) && autoheader --warnings=all +[configure: configure.ac aclocal.m4 + autoconf --warnings=all +include/config.h.in: include/stamp-h.in +include/stamp-h.in: configure.ac aclocal.m4 + autoheader --warnings=all @echo timestamp > \$[@]]) fi @@ -3475,9 +3476,9 @@ then test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.]) WINE_APPEND_RULE( [ALL_POT_FILES =$ALL_POT_FILES -\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot - msgmerge --previous -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[(a)].new && mv \$[(a)].new \$[@] -\$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) +\$(LINGUAS:%=po/%.po): po/wine.pot + msgmerge --previous -q \$[@] po/wine.pot | msgattrib --no-obsolete -o \$[(a)].new && mv \$[(a)].new \$[@] +po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$[@] \$(ALL_POT_FILES)]) fi

1 0

Alexandre Julliard : makefiles: Build makedep from the top-level makefile.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 9fbf473a0b7a47b5e6feb40d1270ab0ee9e11dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbf473a0b7a47b5e6feb40d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 13:14:19 2013 +0100 makefiles: Build makedep from the top-level makefile. --- Makefile.in | 3 --- aclocal.m4 | 9 +-------- configure | 17 ++++++++--------- configure.ac | 6 ++++-- tools/Makefile.in | 7 +------ 5 files changed, 14 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7635612..342dc9f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,9 +75,6 @@ tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp -$(MAKEDEP): include/config.h - @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) - # Misc rules TAGSFLAGS = --langmap='c:+.idl.l.rh,make:(Make*.in)' diff --git a/aclocal.m4 b/aclocal.m4 index 14b6f53..ca52b48 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -218,20 +218,13 @@ wine_fn_depend_rules () ac_alldeps=$[1] ac_makedep="\$(MAKEDEP)" ac_input=Make.vars.in:$ac_dir/Makefile.in - if test $ac_dir != tools - then - dnl makedep is in tools so tools makefile cannot depend on it - ac_alldeps="$[1] $ac_makedep" - else - ac_alldeps="$[1] include/config.h" - fi case $[1] in *.in) ac_input=$ac_input:$[1] ;; *) ac_makedep="$[1] $ac_makedep" ;; esac wine_fn_append_rule \ -"$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps +"$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps \$(MAKEDEP) @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend depend: $ac_dir/depend .PHONY: $ac_dir/depend diff --git a/configure b/configure index 103800d..8277d3c 100755 --- a/configure +++ b/configure @@ -16135,19 +16135,13 @@ wine_fn_depend_rules () ac_alldeps=$1 ac_makedep="\$(MAKEDEP)" ac_input=Make.vars.in:$ac_dir/Makefile.in - if test $ac_dir != tools - then - ac_alldeps="$1 $ac_makedep" - else - ac_alldeps="$1 include/config.h" - fi case $1 in *.in) ac_input=$ac_input:$1 ;; *) ac_makedep="$1 $ac_makedep" ;; esac wine_fn_append_rule \ -"$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps +"$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps \$(MAKEDEP) @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend depend: $ac_dir/depend .PHONY: $ac_dir/depend @@ -17449,9 +17443,12 @@ fi if test "x$enable_tools" != xno then - wine_fn_append_rule "\$(MAKEDEP): tools/Makefile + ac_config_commands="$ac_config_commands tools" + + wine_fn_append_rule "tools/makedep$ac_exeext: tools/makedep.c include/config.h + \$(CC) \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ - \$(RM) tools/makedep\$(EXEEXT)" + \$(RM) tools/makedep$ac_exeext" fi if test -n "$with_wine64" @@ -18214,6 +18211,7 @@ do "Make.rules") CONFIG_FILES="$CONFIG_FILES Make.rules" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;; + "tools") CONFIG_COMMANDS="$CONFIG_COMMANDS tools" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -18862,6 +18860,7 @@ $as_echo "$as_me: creating dlls/wineps.drv/data" >&6;}; as_dir="dlls/wineps.drv/ "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 ;; + "tools":C) as_dir=tools; as_fn_mkdir_p ;; esac done # for ac_tag diff --git a/configure.ac b/configure.ac index b3d47dd..63435d2 100644 --- a/configure.ac +++ b/configure.ac @@ -3492,10 +3492,12 @@ fi if test "x$enable_tools" != xno then + AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) WINE_APPEND_RULE( -[\$(MAKEDEP): tools/Makefile +[tools/makedep$ac_exeext: tools/makedep.c include/config.h + \$(CC) \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ - \$(RM) tools/makedep\$(EXEEXT)]) + \$(RM) tools/makedep$ac_exeext]) fi if test -n "$with_wine64" diff --git a/tools/Makefile.in b/tools/Makefile.in index 17d70f2..2cf9165 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -35,13 +35,10 @@ INSTALLDIRS = \ UPDATE_DESKTOP_DATABASE = update-desktop-database -all: makedep$(EXEEXT) $(PROGRAMS) +all: $(PROGRAMS) @MAKE_RULES@ -makedep $(EXEEXT:%=makedep%): makedep.o - $(CC) $(CFLAGS) -o $@ makedep.o $(LDFLAGS) - make_ctests$(EXEEXT): make_ctests.o $(CC) $(CFLAGS) -o $@ make_ctests.o $(LDFLAGS) @@ -77,5 +74,3 @@ uninstall:: $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) -$(UPDATE_DESKTOP_DATABASE) - -depend: makedep$(EXEEXT)

1 0

Alexandre Julliard : wmc: Don't put timestamps in generated files.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: f775f3e105f3c923368114aa839140d173f1f4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f775f3e105f3c923368114aa8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:18:37 2013 +0100 wmc: Don't put timestamps in generated files. --- tools/wmc/wmc.c | 2 -- tools/wmc/wmc.h | 3 --- tools/wmc/write.c | 17 +++++------------ 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index a08d733..9d34a40 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -174,8 +174,6 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif - now = time(NULL); - /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ cmdlen = 5; /* for "wmc " and \0 */ diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index cf6d430..9ef9ac7 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -21,8 +21,6 @@ #ifndef __WMC_WMC_H #define __WMC_WMC_H -#include <time.h> /* For time_t */ - #include "wmctypes.h" /* @@ -51,7 +49,6 @@ extern char *output_name; extern char *input_name; extern char *header_name; extern char *cmdline; -extern time_t now; extern int line_number; extern int char_number; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index cf170d4..19cd5b3 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -91,7 +91,6 @@ static const char str_header[] = "/* This file is generated with wmc version " PACKAGE_VERSION ". Do not edit! */\n" "/* Source : %s */\n" "/* Cmdline: %s */\n" - "/* Date : %s */\n" "\n" ; @@ -178,11 +177,9 @@ void write_h_file(const char *fname) perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); - fprintf(fp, "#ifndef __WMCGENERATED_%08lx_H\n", (long)now); - fprintf(fp, "#define __WMCGENERATED_%08lx_H\n", (long)now); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); + fprintf(fp, "#ifndef __WMCGENERATED_H\n"); + fprintf(fp, "#define __WMCGENERATED_H\n"); fprintf(fp, "\n"); /* Write severity and facility aliases */ @@ -501,18 +498,14 @@ static void write_rcinline(FILE *fp) void write_rc_file(const char *fname) { - FILE *fp; - char *cptr; + FILE *fp = fopen(fname, "w"); - fp = fopen(fname, "w"); if(!fp) { perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); if(rcinline) write_rcinline(fp);

1 0

Alexandre Julliard : wrc: Remove an unused variable.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 54e0c7fe14671a6fefbe68251b7a958933d0e62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e0c7fe14671a6fefbe68251… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:18:56 2013 +0100 wrc: Remove an unused variable. --- tools/wrc/wrc.c | 3 --- tools/wrc/wrc.h | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index ac1fdcc..8c376e0 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -157,7 +157,6 @@ int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ char *cmdline; /* The entire commandline */ -time_t now; /* The time of start of wrc */ int parser_debug, yy_flex_debug; @@ -348,8 +347,6 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif - now = time(NULL); - /* Set the default defined stuff */ set_version_defines(); wpp_add_cmdline_define("RC_INVOKED=1"); diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index a103ea36..74a65fe 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -21,8 +21,6 @@ #ifndef __WRC_WRC_H #define __WRC_WRC_H -#include <time.h> /* For time_t */ - #include "wrctypes.h" /* From wrc.c */ @@ -47,7 +45,6 @@ extern int check_utf8; extern char *input_name; extern char *cmdline; -extern time_t now; extern int line_number; extern int char_number;

1 0

Alexandre Julliard : wmc: Define WINE_UNICODE_API directly in the source.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: b647703774392a23cebda3f907db0946f8e9b8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b647703774392a23cebda3f90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:20:53 2013 +0100 wmc: Define WINE_UNICODE_API directly in the source. --- tools/wmc/Makefile.in | 1 - tools/wmc/lang.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index c302c22..c8ccbed 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_UNICODE_API="" PROGRAMS = wmc$(EXEEXT) MANPAGE = wmc.man ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE_STATIC) $(LIBPORT) diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 5a11c5b..337d661 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -21,6 +21,7 @@ #ifndef __WMC_LANG_H #define __WMC_LANG_H +#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" typedef struct language {

1 0

Alexandre Julliard : wrc: Define WINE_UNICODE_API directly in the source.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 98de631eb1ff9a54369c9adc27f49ff3240fb5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98de631eb1ff9a54369c9adc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:20:58 2013 +0100 wrc: Define WINE_UNICODE_API directly in the source. --- tools/wrc/Makefile.in | 2 +- tools/wrc/genres.c | 1 - tools/wrc/parser.l | 1 - tools/wrc/parser.y | 1 - tools/wrc/po.c | 1 - tools/wrc/utils.c | 1 - tools/wrc/wrc.h | 2 ++ tools/wrc/writeres.c | 1 - 8 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index a017891..e4210c0 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API="" +EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" PROGRAMS = wrc$(EXEEXT) MANPAGE = wrc.man ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index e49d8a5..61b2b29 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -41,7 +41,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/unicode.h" #define SetResSize(res, tag) set_dword((res), (tag), (res)->size - get_dword((res), (tag))) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 8c50a8a..16a487f 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -112,7 +112,6 @@ cident [a-zA-Z_][0-9a-zA-Z_]* #define YY_NO_UNISTD_H #endif -#include "wine/unicode.h" #include "wrc.h" #include "utils.h" #include "parser.h" diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index ff59327..144ae03 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -135,7 +135,6 @@ #include "newstruc.h" #include "dumpres.h" #include "wine/wpp.h" -#include "wine/unicode.h" #include "parser.h" #include "windef.h" #include "winbase.h" diff --git a/tools/wrc/po.c b/tools/wrc/po.c index d6ea262..1be7650 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -40,7 +40,6 @@ #include "wingdi.h" #include "winuser.h" #include "wine/list.h" -#include "wine/unicode.h" static resource_t *new_top, *new_tail; diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index a45b338..4dc3364 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -28,7 +28,6 @@ #include <string.h> #include <ctype.h> -#include "wine/unicode.h" #include "wrc.h" #include "utils.h" #include "parser.h" diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 74a65fe..5892daf 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -21,6 +21,8 @@ #ifndef __WRC_WRC_H #define __WRC_WRC_H +#define WINE_UNICODE_API /* nothing */ +#include "wine/unicode.h" #include "wrctypes.h" /* From wrc.c */ diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c index 0bcad16..07d4f74 100644 --- a/tools/wrc/writeres.c +++ b/tools/wrc/writeres.c @@ -26,7 +26,6 @@ #include <string.h> #include <assert.h> -#include "wine/unicode.h" #include "wrc.h" #include "genres.h" #include "newstruc.h"

1 0

André Hentschel : oleaut32/tests: Fix olefont tests compilation with __WINESRC__ defined.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 1f31eb42cc8b1ef68aee8c232e91a51b84832b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f31eb42cc8b1ef68aee8c232… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:24:37 2013 +0200 oleaut32/tests: Fix olefont tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/olefont.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 9761778..1af1b6d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -66,7 +66,7 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, LPVOID pvObj = NULL; IFont* ifnt = NULL; HFONT hfont; - LOGFONT lf; + LOGFONTA lf; CY psize; HRESULT hres; DWORD rtnval; @@ -110,7 +110,7 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, hres = IFont_get_hFont (ifnt, &hfont); ok(hres == S_OK, "%s: IFont_get_hFont returns 0x%08x instead of S_OK.\n", test_name, hres); - rtnval = GetObject (hfont, sizeof(LOGFONT), &lf); + rtnval = GetObjectA(hfont, sizeof(LOGFONTA), &lf); ok(rtnval > 0, "GetObject(hfont) failed\n"); /* Since font scaling may encounter rounding errors, allow 1 pixel deviation. */

1 0

André Hentschel : oleaut32/tests: Fix olepicture tests compilation with __WINESRC__ defined.
by Alexandre Julliard 28 Oct '13

28 Oct '13

Module: wine Branch: master Commit: 320a3f7e7d0cfe5a24badf589257eff38527a067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=320a3f7e7d0cfe5a24badf589… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:25:25 2013 +0200 oleaut32/tests: Fix olepicture tests compilation with __WINESRC__ defined. --- dlls/oleaut32/tests/olepicture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index db10baa..de37322 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -220,7 +220,7 @@ test_pic_with_stream(LPSTREAM stream, unsigned int imgsize) if (handle) { BITMAP bmp; - GetObject(UlongToHandle(handle), sizeof(BITMAP), &bmp); + GetObjectA(UlongToHandle(handle), sizeof(BITMAP), &bmp); todo_wine ok(bmp.bmBits != 0, "not a dib\n"); } @@ -640,7 +640,7 @@ static void test_Render(void) desc.cbSizeofstruct = sizeof(PICTDESC); desc.picType = PICTYPE_ICON; - desc.u.icon.hicon = LoadIcon(NULL, IDI_APPLICATION); + desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); if(!desc.u.icon.hicon){ win_skip("LoadIcon failed. Skipping...\n"); ReleaseDC(NULL, hdc); @@ -1020,7 +1020,7 @@ static void test_load_save_icon(void) desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_ICON; - desc.u.icon.hicon = LoadIcon(0, IDI_APPLICATION); + desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr);

1 0