October 2013 - Wine-Commits

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

Oct. 28, 2013

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 : makefiles: Expand srcdir directly into the top-level makefile.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

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: Generate explicit build rules for C source files from makedep.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

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

Dmitry Timoshkov : atl100: ReadFile doesn't directly return an error code.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 87d8250117d933c6866967ed43145ad09054c8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d8250117d933c6866967ed4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 28 17:28:05 2013 +0900 atl100: ReadFile doesn't directly return an error code. --- dlls/atl100/registrar.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/registrar.c b/dlls/atl100/registrar.c index 414ad2b..b255e12 100644 --- a/dlls/atl100/registrar.c +++ b/dlls/atl100/registrar.c @@ -495,15 +495,13 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist DWORD filelen, len; LPWSTR regstrw; LPSTR regstra; - LRESULT lres; HRESULT hres; file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if(file != INVALID_HANDLE_VALUE) { filelen = GetFileSize(file, NULL); regstra = HeapAlloc(GetProcessHeap(), 0, filelen); - lres = ReadFile(file, regstra, filelen, NULL, NULL); - if(lres == ERROR_SUCCESS) { + if(ReadFile(file, regstra, filelen, NULL, NULL)) { len = MultiByteToWideChar(CP_ACP, 0, regstra, filelen, NULL, 0)+1; regstrw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, regstra, filelen, regstrw, len); @@ -514,7 +512,7 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist HeapFree(GetProcessHeap(), 0, regstrw); }else { WARN("Failed to read faile\n"); - hres = HRESULT_FROM_WIN32(lres); + hres = HRESULT_FROM_WIN32(GetLastError()); } HeapFree(GetProcessHeap(), 0, regstra); CloseHandle(file);

1 0

Dmitry Timoshkov : atl100: Drop file attribute when opening an existing file and specify appropriate sharing mode .
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 22cb898c9edcd9a0029eee8b6f03e410d956ed7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cb898c9edcd9a0029eee8b6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 28 17:28:02 2013 +0900 atl100: Drop file attribute when opening an existing file and specify appropriate sharing mode. --- dlls/atl100/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/registrar.c b/dlls/atl100/registrar.c index 9cad32a..414ad2b 100644 --- a/dlls/atl100/registrar.c +++ b/dlls/atl100/registrar.c @@ -498,7 +498,7 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist LRESULT lres; HRESULT hres; - file = CreateFileW(fileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if(file != INVALID_HANDLE_VALUE) { filelen = GetFileSize(file, NULL); regstra = HeapAlloc(GetProcessHeap(), 0, filelen);

1 0

Dmitry Timoshkov : cryptnet: Avoid preliminary blob size initialization.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 876cc598c366c2acbc776421ce1e6109147d5d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=876cc598c366c2acbc776421c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 28 17:28:16 2013 +0900 cryptnet: Avoid preliminary blob size initialization. --- dlls/cryptnet/cryptnet_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 35d6609..13ca6e2 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -464,7 +464,6 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) blob.pbData = CryptMemAlloc(size.u.LowPart); if (blob.pbData) { - blob.cbData = size.u.LowPart; ret = ReadFile(hFile, blob.pbData, size.u.LowPart, &blob.cbData, NULL); if (ret)

1 0

Francois Gouget : winspool.drv/tests: Fix the OpenPrinter() tests error reporting.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 3ad70f9e11f71ed61e446485305e201c8f9c552f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad70f9e11f71ed61e4464853… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 27 11:47:33 2013 +0100 winspool.drv/tests: Fix the OpenPrinter() tests error reporting. --- dlls/winspool.drv/tests/info.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 601cb60..4ab9c89 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2912,7 +2912,7 @@ static void test_OpenPrinter_defaults(void) ok( !ret, "got %d\n", ret ); pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "GetPrinterA() failed le=%d\n", GetLastError() ); default_size = pi->pDevMode->u1.s1.dmPaperSize; HeapFree( GetProcessHeap(), 0, pi ); @@ -2920,13 +2920,13 @@ static void test_OpenPrinter_defaults(void) ok( !ret, "got %d\n", ret ); add_job = HeapAlloc( GetProcessHeap(), 0, needed ); ret = AddJobA( printer, 1, (BYTE *)add_job, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "AddJobA() failed le=%d\n", GetLastError() ); ret = GetJobA( printer, add_job->JobId, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); job_info = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetJobA( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "GetJobA() failed le=%d\n", GetLastError() ); todo_wine ok( job_info->pDevMode != NULL, "got NULL DEVMODEA\n"); @@ -2951,14 +2951,14 @@ todo_wine prn_def.DesiredAccess = PRINTER_ACCESS_USE; ret = OpenPrinterA( default_printer, &printer, &prn_def ); - ok( ret, "got %d\n", ret ); + ok( ret, "OpenPrinterA() failed le=%d\n", GetLastError() ); /* GetPrinter stills returns default size */ ret = GetPrinterA( printer, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "GetPrinterA() failed le=%d\n", GetLastError() ); ok( pi->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", pi->pDevMode->u1.s1.dmPaperSize, default_size ); @@ -2969,13 +2969,13 @@ todo_wine ok( !ret, "got %d\n", ret ); add_job = HeapAlloc( GetProcessHeap(), 0, needed ); ret = AddJobA( printer, 1, (BYTE *)add_job, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "AddJobA() failed le=%d\n", GetLastError() ); ret = GetJobA( printer, add_job->JobId, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); job_info = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetJobA( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); - ok( ret, "got %d\n", ret ); + ok( ret, "GetJobA() failed le=%d\n", GetLastError() ); ok( job_info->pDevMode->dmFields == DM_PAPERSIZE, "got %08x\n", job_info->pDevMode->dmFields );

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 4dc152bd707282ad1a2a45c1636a1cb52345ce9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc152bd707282ad1a2a45c16… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 27 00:23:45 2013 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 0f84529..1525662 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3381,7 +3381,7 @@ static void test_surface_lock(void) if (tests[i].caps & DDSCAPS_ZBUFFER) { ddsd.dwFlags |= DDSD_ZBUFFERBITDEPTH; - ddsd.dwZBufferBitDepth = z_depth; + U2(ddsd).dwZBufferBitDepth = z_depth; } ddsd.ddsCaps.dwCaps = tests[i].caps; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f4702f1..7ff6075 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4041,7 +4041,7 @@ static void test_surface_lock(void) if (tests[i].caps & DDSCAPS_ZBUFFER) { ddsd.dwFlags |= DDSD_ZBUFFERBITDEPTH; - ddsd.dwZBufferBitDepth = z_depth; + U2(ddsd).dwZBufferBitDepth = z_depth; } ddsd.ddsCaps.dwCaps = tests[i].caps; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 61a54bb..ac885b4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4665,7 +4665,7 @@ static void test_surface_lock(void) if (tests[i].caps & DDSCAPS_ZBUFFER) { ddsd.dwFlags |= DDSD_PIXELFORMAT; - ddsd.ddpfPixelFormat = z_fmt; + U4(ddsd).ddpfPixelFormat = z_fmt; } ddsd.ddsCaps.dwCaps = tests[i].caps; ddsd.ddsCaps.dwCaps2 = tests[i].caps2; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 44a68c4..c4a6acb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4551,7 +4551,7 @@ static void test_surface_lock(void) if (tests[i].caps & DDSCAPS_ZBUFFER) { ddsd.dwFlags |= DDSD_PIXELFORMAT; - ddsd.ddpfPixelFormat = z_fmt; + U4(ddsd).ddpfPixelFormat = z_fmt; } ddsd.ddsCaps.dwCaps = tests[i].caps; ddsd.ddsCaps.dwCaps2 = tests[i].caps2;

1 0

Frédéric Delanoy : msi: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: 8793b5fe28b6f73be56c5ecdb3039b0cf21a2179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8793b5fe28b6f73be56c5ecdb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 26 14:01:20 2013 +0200 msi: Use BOOL type where appropriate. --- dlls/msi/action.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d964787..ade5a3c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -211,19 +211,20 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) enum parse_state state = state_quote; const WCHAR *p; WCHAR *out = value; - int ignore, in_quotes = 0, count = 0, len = 0; + BOOL ignore, in_quotes = FALSE; + int count = 0, len = 0; for (p = str; *p; p++) { - ignore = 0; + ignore = FALSE; switch (state) { case state_whitespace: switch (*p) { case ' ': - in_quotes = 1; - ignore = 1; + in_quotes = TRUE; + ignore = TRUE; len++; break; case '"': @@ -233,7 +234,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; default: state = state_token; - in_quotes = 1; + in_quotes = TRUE; len++; break; } @@ -250,12 +251,12 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) case ' ': state = state_whitespace; if (!count) goto done; - in_quotes = 1; + in_quotes = TRUE; len++; break; default: - if (!count) in_quotes = 0; - else in_quotes = 1; + if (!count) in_quotes = FALSE; + else in_quotes = TRUE; len++; break; } @@ -271,13 +272,13 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) case ' ': state = state_whitespace; if (!count || (count > 1 && !len)) goto done; - in_quotes = 1; + in_quotes = TRUE; len++; break; default: state = state_token; - if (!count) in_quotes = 0; - else in_quotes = 1; + if (!count) in_quotes = FALSE; + else in_quotes = TRUE; len++; break; }

1 0

Vincent Povirk : xinput1_3: Make XInputGetState patchable.
by Alexandre Julliard Oct. 28, 2013

Oct. 28, 2013

Module: wine Branch: master Commit: b29c2b050defc9137f88d5927edb5675c8f4a5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29c2b050defc9137f88d5927… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 25 16:18:24 2013 -0500 xinput1_3: Make XInputGetState patchable. --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index a2a83dd..63f725b 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -65,7 +65,7 @@ DWORD WINAPI XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) { static int warn_once;

1 0