December 2013 - Wine-commits

Alexandre Julliard : makefiles: Explicitly specify source directory in Makefile dependencies.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: be2c66d50493d8661ab4a7549850a70e794bb53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2c66d50493d8661ab4a7549… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 13:15:34 2013 +0100 makefiles: Explicitly specify source directory in Makefile dependencies. --- Makefile.in | 4 ++-- aclocal.m4 | 11 +++++++---- configure | 13 ++++++++----- configure.ac | 2 +- tools/makedep.c | 4 ++-- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile.in b/Makefile.in index eb4d0da..c2bb1ed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,11 +32,11 @@ all: wine # Rules for re-running configure -config.status: configure +config.status: $(srcdir)/configure @./config.status --recheck include/config.h: include/stamp-h -include/stamp-h: include/config.h.in config.status +include/stamp-h: $(srcdir)/include/config.h.in config.status @./config.status include/config.h include/stamp-h # Rules for cleaning diff --git a/aclocal.m4 b/aclocal.m4 index d6f5790..6231772 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -219,12 +219,15 @@ wine_fn_depend_rules () ac_makedep="\$(MAKEDEP)" ac_input=Make.vars.in:$ac_dir/Makefile.in case $[1] in - *.in) ac_input=$ac_input:$[1] ;; - *) ac_makedep="$[1] $ac_makedep" ;; + *.in) + ac_input=$ac_input:$[1] + test "$srcdir" = . || ac_alldeps="$srcdir/$ac_alldeps" ;; + *) + ac_makedep="$[1] $ac_makedep" ;; esac wine_fn_append_rule \ -"$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps \$(MAKEDEP) +"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/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 @@ -628,7 +631,7 @@ wine_fn_config_makerules () ac_rules=$[1] ac_deps=$[2] wine_fn_append_rule \ -"$ac_rules: $ac_rules.in $ac_deps config.status +"$ac_rules: $srcdir/$ac_rules.in $ac_deps config.status @./config.status $ac_rules distclean:: \$(RM) $ac_rules" diff --git a/configure b/configure index 81a474f..9953777 100755 --- a/configure +++ b/configure @@ -16216,12 +16216,15 @@ wine_fn_depend_rules () ac_makedep="\$(MAKEDEP)" ac_input=Make.vars.in:$ac_dir/Makefile.in case $1 in - *.in) ac_input=$ac_input:$1 ;; - *) ac_makedep="$1 $ac_makedep" ;; + *.in) + ac_input=$ac_input:$1 + test "$srcdir" = . || ac_alldeps="$srcdir/$ac_alldeps" ;; + *) + ac_makedep="$1 $ac_makedep" ;; esac wine_fn_append_rule \ -"$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps \$(MAKEDEP) +"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/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 @@ -16641,7 +16644,7 @@ wine_fn_config_makerules () ac_rules=$1 ac_deps=$2 wine_fn_append_rule \ -"$ac_rules: $ac_rules.in $ac_deps config.status +"$ac_rules: $srcdir/$ac_rules.in $ac_deps config.status @./config.status $ac_rules distclean:: \$(RM) $ac_rules" @@ -16677,7 +16680,7 @@ wine_fn_append_rule " .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: Makefile.in Make.vars.in Make.rules config.status +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile" if test "x$enable_fonts" != xno; then diff --git a/configure.ac b/configure.ac index 0124652..aa17064 100644 --- a/configure.ac +++ b/configure.ac @@ -2667,7 +2667,7 @@ WINE_APPEND_RULE([ .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: Makefile.in Make.vars.in Make.rules config.status +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) diff --git a/tools/makedep.c b/tools/makedep.c index f8415c6..32383f4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1363,7 +1363,7 @@ static void output_sources(void) if (find_src_file( "dlldata.o" )) { - output( "dlldata.c: $(WIDL) Makefile.in\n" ); + output( "dlldata.c: $(WIDL) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); column = output( "\t$(WIDL) --dlldata-only -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (source->flags & FLAG_IDL_PROXY) output_filename( source->filename, &column ); @@ -1373,7 +1373,7 @@ static void output_sources(void) if (is_test) { - output( "testlist.c: $(MAKECTESTS) Makefile.in\n" ); + output( "testlist.c: $(MAKECTESTS) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); column = output( "\t$(MAKECTESTS) -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (strendswith( source->name, ".c" ) && !is_generated_idl( source ))

1 0

Alexandre Julliard : makefiles: Explicitly specify source directory in spec file dependencies.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 180bc4b878c4151a6dba8706f6a213a0120c1089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180bc4b878c4151a6dba8706f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 13:23:57 2013 +0100 makefiles: Explicitly specify source directory in spec file dependencies. --- Make.rules.in | 4 ++-- aclocal.m4 | 8 ++++---- configure | 12 ++++++------ configure.ac | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index dff13b8..6b9a996 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -69,10 +69,10 @@ $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_SRCS:.c=.o) $(RANLIB) $@ $(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) - $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_SRCS:.c=.o) + $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) - $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) + $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies diff --git a/aclocal.m4 b/aclocal.m4 index 6231772..f186ce1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -432,7 +432,7 @@ $ac_dir/uninstall:: wine_fn_append_rule \ "__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) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(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 @@ -465,9 +465,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy then wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(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) +$ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(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) @@ -480,7 +480,7 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec" fi diff --git a/configure b/configure index 9953777..95058cf 100755 --- a/configure +++ b/configure @@ -16137,9 +16137,9 @@ fi MAKE_DLL_RULES=" DLLFLAGS = $DLLFLAGS -MAINSPEC = \$(MODULE:%.dll=%).spec +MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) +MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) all: $deps @@ -16439,7 +16439,7 @@ fi wine_fn_append_rule \ "__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) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(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 @@ -16472,9 +16472,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy then wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(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) +$ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(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) @@ -16487,7 +16487,7 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec" fi diff --git a/configure.ac b/configure.ac index aa17064..c2c7460 100644 --- a/configure.ac +++ b/configure.ac @@ -2610,9 +2610,9 @@ fi AC_SUBST(MAKE_DLL_RULES," DLLFLAGS = $DLLFLAGS -MAINSPEC = \$(MODULE:%.dll=%).spec +MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) +MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) all: $deps

1 0

Alexandre Julliard : makefiles: Explicitly specify source directory in font dependencies.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 7a8d1838b032ce8c10d26222ed6575b8f9fb405f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8d1838b032ce8c10d26222e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 13:25:14 2013 +0100 makefiles: Explicitly specify source directory in font dependencies. --- fonts/Makefile.in | 108 ++++++++++++++++++++++++++--------------------------- 1 files changed, 53 insertions(+), 55 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 07177ca..43ad860 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -59,170 +59,168 @@ TRUETYPE_FONTS = \ tahomabd.ttf \ wingding.ttf -FONTS = $(BITMAP_FONTS) $(TRUETYPE_FONTS) - -all: $(FONTS) +all: $(BITMAP_FONTS) @MAKE_RULES@ -coure.fon: courier.ttf +coure.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1252,8 -couree.fon: courier.ttf +couree.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1250,8 -courer.fon: courier.ttf +courer.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1251,8 -coureg.fon: courier.ttf +coureg.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1253,8 -couret.fon: courier.ttf +couret.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1254,8 -coue1255.fon: courier.ttf +coue1255.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1255,8 -coue1256.fon: courier.ttf +coue1256.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1256,8 -coue1257.fon: courier.ttf +coue1257.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1257,8 -vgafix.fon: fixedsys.ttf +vgafix.fon: $(srcdir)/fixedsys.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8 -jvgafix.fon: fixedsys_jp.ttf +jvgafix.fon: $(srcdir)/fixedsys_jp.ttf $(SFNT2FNT) -o $@ -d 160 $(srcdir)/fixedsys_jp.ttf 18,932,8 -sserife.fon: ms_sans_serif.ttf +sserife.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8 -sseriff.fon: ms_sans_serif.ttf +sseriff.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1252,7 20,1252,8 -sserifee.fon: ms_sans_serif.ttf +sserifee.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1250,5 16,1250,7 -sseriffe.fon: ms_sans_serif.ttf +sseriffe.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1250,7 -sserifer.fon: ms_sans_serif.ttf +sserifer.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8 -sseriffr.fon: ms_sans_serif.ttf +sseriffr.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1251,7 20,1251,8 -sserifeg.fon: ms_sans_serif.ttf +sserifeg.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8 -sseriffg.fon: ms_sans_serif.ttf +sseriffg.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1253,7 20,1253,8 -sserifet.fon: ms_sans_serif.ttf +sserifet.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8 -sserifft.fon: ms_sans_serif.ttf +sserifft.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1254,7 20,1254,8 -ssee1255.fon: ms_sans_serif.ttf +ssee1255.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8 -ssef1255.fon: ms_sans_serif.ttf +ssef1255.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1255,7 20,1255,8 -ssee1256.fon: ms_sans_serif.ttf +ssee1256.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8 -ssef1256.fon: ms_sans_serif.ttf +ssef1256.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1256,7 20,1256,8 -ssee1257.fon: ms_sans_serif.ttf +ssee1257.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8 -ssef1257.fon: ms_sans_serif.ttf +ssef1257.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1257,7 20,1257,8 -ssee874.fon: ms_sans_serif.ttf +ssee874.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8 -ssef874.fon: ms_sans_serif.ttf +ssef874.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,874,7 20,874,8 -smalle.fon: small_fonts.ttf +smalle.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1252,5 -smallee.fon: small_fonts.ttf +smallee.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1250,5 -smaller.fon: small_fonts.ttf +smaller.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1251,5 -smalleg.fon: small_fonts.ttf +smalleg.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1253,5 -smallet.fon: small_fonts.ttf +smallet.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1254,5 -smae1255.fon: small_fonts.ttf +smae1255.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1255,5 -smae1256.fon: small_fonts.ttf +smae1256.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1256,5 -smae1257.fon: small_fonts.ttf +smae1257.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1257,5 -jsmalle.fon: small_fonts_jp.ttf +jsmalle.fon: $(srcdir)/small_fonts_jp.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts_jp.ttf 11,932,7 -vgasys.fon: system.ttf +vgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1252,7 -vgasyse.fon: system.ttf +vgasyse.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1250,7 -vgasysr.fon: system.ttf +vgasysr.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1251,7 -vgasysg.fon: system.ttf +vgasysg.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1253,7 -vgasyst.fon: system.ttf +vgasyst.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1254,7 -vgas1255.fon: system.ttf +vgas1255.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1255,7 -vgas1256.fon: system.ttf +vgas1256.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1256,7 -vgas1257.fon: system.ttf +vgas1257.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1257,7 -vgas874.fon: system.ttf +vgas874.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,874,7 -jvgasys.fon: system.ttf +jvgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 18,932,8 -svgasys.fon: system.ttf +svgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,936,7 16,1252,7 -hvgasys.fon: system.ttf +hvgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,949,7 -cvgasys.fon: system.ttf +cvgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,950,7 16,1252,7 $(BITMAP_FONTS): $(SFNT2FNT) -install install-lib:: $(FONTS) $(INSTALLDIRS) +install install-lib:: $(BITMAP_FONTS) $(INSTALLDIRS) for i in $(BITMAP_FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done uninstall:: - -cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS) + -cd $(DESTDIR)$(fontdir) && $(RM) $(BITMAP_FONTS) $(TRUETYPE_FONTS) -rmdir $(DESTDIR)$(fontdir) clean::

1 0

Alexandre Julliard : makefiles: Add separate clean targets even in the non-recursive case.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: e0d5010f404da77b881c552ac5618b9aa62f79bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d5010f404da77b881c552ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 17:25:51 2013 +0100 makefiles: Add separate clean targets even in the non-recursive case. --- aclocal.m4 | 8 ++++++-- configure | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f186ce1..e09045f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -315,7 +315,9 @@ $ac_dir/clean: $ac_dir/Makefile \$(RM) $ac_dir/Makefile" else wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" fi } @@ -325,7 +327,9 @@ wine_fn_disabled_rules () ac_clean=$[@] wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" } diff --git a/configure b/configure index 95058cf..1b160db 100755 --- a/configure +++ b/configure @@ -16312,7 +16312,9 @@ $ac_dir/clean: $ac_dir/Makefile \$(RM) $ac_dir/Makefile" else wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" fi } @@ -16322,7 +16324,9 @@ wine_fn_disabled_rules () ac_clean=$@ wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.8
by Jeremy Newman 12 Dec '13

12 Dec '13

Module: website Branch: master Commit: 4e6158a1ff4a5c5be3d9e3549fda8a25b1c239a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=4e6158a1ff4a5c5be3d9e3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Dec 11 16:17:20 2013 +0100 Polish translation for release 1.7.8 --- news/pl/2013120601.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2013120601.xml b/news/pl/2013120601.xml new file mode 100644 index 0000000..e22cd44 --- /dev/null +++ b/news/pl/2013120601.xml @@ -0,0 +1,16 @@ +<news> +<date>Grudzień 6, 2013</date> +<title>Wydano Wine 1.7.8</title> +<body> + Wydanie rozwojowe Wine 1.7.8 jest już dostępne. + <a href="{$root}/announce/1.7.8">Co nowego</a> w tym wydaniu: +<ul> + <li>Uaktualniona wersja pakietu Mono.</li> + <li>Ulepszenia w implementacji usługi BITS.</li> + <li>Lepsze tabele danych we wsparciu japońskich pionowych czcionek.</li> + <li>Ulepszone ślady wykonywania na nowych wersjach Mac OS X.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.8.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Jacek Caban : oleaut32: Check OANOCACHE variable only on process attach.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: f50ead6358f0b8fc271dba05360ce866a16cacce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50ead6358f0b8fc271dba053… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 11 16:15:02 2013 +0100 oleaut32: Check OANOCACHE variable only on process attach. --- dlls/oleaut32/oleaut.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 60ff191..4cd5135 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -875,7 +875,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) { static const WCHAR oanocacheW[] = {'o','a','n','o','c','a','c','h','e',0}; - bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); + if(fdwReason == DLL_PROCESS_ATTACH) + bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); }

1 0

Nikolay Sivov : shell32: Don't call comctl32 on unload time if it wasn' t used before.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: b5312b70f5c160b3aa3d374256f71ad4aa1f98e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5312b70f5c160b3aa3d37425… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 11 08:36:59 2013 +0400 shell32: Don't call comctl32 on unload time if it wasn't used before. --- dlls/shell32/iconcache.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index a2373fa..3d54508 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -405,8 +405,10 @@ void SIC_Destroy(void) if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); - ImageList_Destroy(ShellSmallIconList); - ImageList_Destroy(ShellBigIconList); + if (ShellSmallIconList) + ImageList_Destroy(ShellSmallIconList); + if (ShellBigIconList) + ImageList_Destroy(ShellBigIconList); LeaveCriticalSection(&SHELL32_SicCS); DeleteCriticalSection(&SHELL32_SicCS);

1 0

Hans Leidekker : wininet: Return an error when ensure_cred_handle fails.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 9373d4c5780aee66f4c463741e3d3de192aaef55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9373d4c5780aee66f4c463741… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:47:54 2013 +0100 wininet: Return an error when ensure_cred_handle fails. --- dlls/wininet/netconnection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index b1368bf..c8879b6 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -494,7 +494,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; if(!ensure_cred_handle()) - return FALSE; + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; if(compat_mode) { if(!have_compat_cred_handle)

1 0

Hans Leidekker : wininet: Separate socket destruction from destruction of the connection object.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 6c7c15059a5407769a9edefb88e18f5463897c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7c15059a5407769a9edefb8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:48:41 2013 +0100 wininet: Separate socket destruction from destruction of the connection object. --- dlls/wininet/dialogs.c | 2 +- dlls/wininet/http.c | 29 ++++++++++++++--------------- dlls/wininet/internet.h | 3 +++ dlls/wininet/netconnection.c | 16 +++++++++++++++- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 4acda13..52a18f3 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -457,7 +457,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( /* FIXME: Use helper function */ flags |= SECURITY_FLAG_SECURE; req->security_flags |= flags; - if(req->netconn) + if(is_valid_netconn(req->netconn)) req->netconn->security_flags |= flags; } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 09a43f8..817fea1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1947,7 +1947,7 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) { TRACE("%p %p\n",req, req->netconn); - if(!req->netconn) + if(!is_valid_netconn(req->netconn)) return; if(reuse && req->netconn->keep_alive) { @@ -1988,8 +1988,7 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0); - free_netconn(req->netconn); - req->netconn = NULL; + close_netconn(req->netconn); INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); @@ -2092,7 +2091,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->Flags |= IDSI_FLAG_KEEP_ALIVE; if (req->proxy) info->Flags |= IDSI_FLAG_PROXY; - if (req->netconn && req->netconn->secure) + if (is_valid_netconn(req->netconn) && req->netconn->secure) info->Flags |= IDSI_FLAG_SECURE; return ERROR_SUCCESS; @@ -2109,7 +2108,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_INSUFFICIENT_BUFFER; *size = sizeof(DWORD); - flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags; + flags = is_valid_netconn(req->netconn) ? req->netconn->security_flags : req->security_flags | req->server->security_flags; *(DWORD *)buffer = flags; TRACE("INTERNET_OPTION_SECURITY_FLAGS %x\n", flags); @@ -2314,7 +2313,7 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, TRACE("INTERNET_OPTION_SECURITY_FLAGS %08x\n", flags); flags &= SECURITY_SET_MASK; req->security_flags |= flags; - if(req->netconn) + if(is_valid_netconn(req->netconn)) req->netconn->security_flags |= flags; return ERROR_SUCCESS; } @@ -2626,7 +2625,7 @@ static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; DWORD avail = 0; - if(req->netconn) + if(is_valid_netconn(req->netconn)) NETCON_query_data_available(req->netconn, &avail); return netconn_stream->content_length == ~0u ? avail @@ -2636,7 +2635,7 @@ static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) static BOOL netconn_end_of_data(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; - return netconn_stream->content_read == netconn_stream->content_length || !req->netconn; + return netconn_stream->content_read == netconn_stream->content_length || !is_valid_netconn(req->netconn); } static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, @@ -2654,7 +2653,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, size = avail; } - if(size && req->netconn) { + if(size && is_valid_netconn(req->netconn)) { if((res = NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len))) len = 0; if(!len) @@ -2836,7 +2835,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(read_mode == READMODE_NOBLOCK) { DWORD avail; - if(!req->netconn || !NETCON_query_data_available(req->netconn, &avail) || !avail) + if(!is_valid_netconn(req->netconn) || !NETCON_query_data_available(req->netconn, &avail) || !avail) break; if(read_bytes > avail) read_bytes = avail; @@ -3037,7 +3036,7 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) { BOOL ret; - if(!req->netconn || req->contentLength == -1) + if(!is_valid_netconn(req->netconn) || req->contentLength == -1) return FALSE; if(!strcmpW(req->verb, szHEAD)) @@ -4790,7 +4789,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if (request->netconn) { - if (NETCON_is_alive(request->netconn)) + if (is_valid_netconn(request->netconn) && NETCON_is_alive(request->netconn)) { *reusing = TRUE; return ERROR_SUCCESS; @@ -4812,7 +4811,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) netconn = LIST_ENTRY(list_head(&request->server->conn_pool), netconn_t, pool_entry); list_remove(&netconn->pool_entry); - if(NETCON_is_alive(netconn)) + if(is_valid_netconn(netconn) && NETCON_is_alive(netconn)) break; TRACE("connection %p closed during idle\n", netconn); @@ -5219,7 +5218,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ INT responseLen; DWORD res = ERROR_SUCCESS; - if(!request->netconn) { + if(!is_valid_netconn(request->netconn)) { WARN("Not connected\n"); send_request_complete(request, 0, ERROR_INTERNET_OPERATION_CANCELLED); return ERROR_INTERNET_OPERATION_CANCELLED; @@ -5891,7 +5890,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) TRACE("-->\n"); - if(!request->netconn) + if(!is_valid_netconn(request->netconn)) goto lend; /* clear old response headers (eg. from a redirect response) */ diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3d948cf..28af0f7 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -108,6 +108,9 @@ typedef struct struct list pool_entry; } netconn_t; +BOOL is_valid_netconn(netconn_t *) DECLSPEC_HIDDEN; +void close_netconn(netconn_t *) DECLSPEC_HIDDEN; + static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c8879b6..c90ef69 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -321,6 +321,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t if (!res) { closesocket(netconn->socket); + netconn->socket = -1; return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) @@ -333,7 +334,10 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t } } if(result == -1) + { closesocket(netconn->socket); + netconn->socket = -1; + } else { flag = 0; ioctlsocket(netconn->socket, FIONBIO, &flag); @@ -378,6 +382,17 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m return result; } +BOOL is_valid_netconn(netconn_t *netconn) +{ + return netconn && netconn->socket != -1; +} + +void close_netconn(netconn_t *netconn) +{ + closesocket(netconn->socket); + netconn->socket = -1; +} + void free_netconn(netconn_t *netconn) { server_release(netconn->server); @@ -395,7 +410,6 @@ void free_netconn(netconn_t *netconn) DeleteSecurityContext(&netconn->ssl_ctx); } - closesocket(netconn->socket); heap_free(netconn); }

1 0

Hans Leidekker : wininet: Always store the SSL context.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 7ba776532d73a180130a33aee46e6182b535ce8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba776532d73a180130a33aee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:49:34 2013 +0100 wininet: Always store the SSL context. This allows applications to query certificate properties when verification has failed. --- dlls/wininet/netconnection.c | 18 ++++++++---------- dlls/wininet/tests/http.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c90ef69..86c9b08 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -369,6 +369,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; list_init(&netconn->pool_entry); + SecInvalidateHandle(&netconn->ssl_ctx); result = create_netconn_socket(server, netconn, timeout); if (result != ERROR_SUCCESS) { @@ -407,7 +408,8 @@ void free_netconn(netconn_t *netconn) heap_free(netconn->extra_buf); netconn->extra_buf = NULL; netconn->extra_len = 0; - DeleteSecurityContext(&netconn->ssl_ctx); + if (SecIsValidHandle(&netconn->ssl_ctx)) + DeleteSecurityContext(&netconn->ssl_ctx); } heap_free(netconn); @@ -586,6 +588,10 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode TRACE("InitializeSecurityContext ret %08x\n", status); if(status == SEC_E_OK) { + if(SecIsValidHandle(&connection->ssl_ctx)) + DeleteSecurityContext(&connection->ssl_ctx); + connection->ssl_ctx = ctx; + if(in_bufs[1].BufferType == SECBUFFER_EXTRA) FIXME("SECBUFFER_EXTRA not supported\n"); @@ -617,19 +623,14 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } } - if(status != SEC_E_OK || res != ERROR_SUCCESS) { - WARN("Failed to initialize security context failed: %08x\n", status); + WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf); connection->ssl_buf = NULL; - DeleteSecurityContext(&ctx); return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; } - TRACE("established SSL connection\n"); - connection->ssl_ctx = ctx; - connection->secure = TRUE; connection->security_flags |= SECURITY_FLAG_SECURE; @@ -963,9 +964,6 @@ LPCVOID NETCON_GetCert(netconn_t *connection) const CERT_CONTEXT *ret; SECURITY_STATUS res; - if (!connection->secure) - return NULL; - res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&ret); return res == SEC_E_OK ? ret : NULL; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index eb09bc7..951460f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4137,6 +4137,7 @@ static void _set_secflags(unsigned line, HINTERNET req, BOOL use_undoc, DWORD fl static void test_security_flags(void) { + INTERNET_CERTIFICATE_INFOA *cert; HINTERNET ses, conn, req; DWORD size, flags; char buf[100]; @@ -4259,6 +4260,30 @@ static void test_security_flags(void) ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), "req_error = %d\n", req_error); + size = 0; + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); + ok(res || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == sizeof(INTERNET_CERTIFICATE_INFOA), "size = %u\n", size); + cert = HeapAlloc(GetProcessHeap(), 0, size); + cert->lpszSubjectInfo = NULL; + cert->lpszIssuerInfo = NULL; + cert->lpszSignatureAlgName = (char *)0xdeadbeef; + cert->lpszEncryptionAlgName = (char *)0xdeadbeef; + cert->lpszProtocolName = (char *)0xdeadbeef; + cert->dwKeySize = 0xdeadbeef; + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, cert, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + if (res) + { + ok(cert->lpszSubjectInfo && strlen(cert->lpszSubjectInfo) > 1, "expected a non-empty subject name\n"); + ok(cert->lpszIssuerInfo && strlen(cert->lpszIssuerInfo) > 1, "expected a non-empty issuer name\n"); + ok(!cert->lpszSignatureAlgName, "unexpected signature algorithm name\n"); + ok(!cert->lpszEncryptionAlgName, "unexpected encryption algorithm name\n"); + ok(!cert->lpszProtocolName, "unexpected protocol name\n"); + ok(cert->dwKeySize != 0xdeadbeef, "unexpected key size\n"); + } + HeapFree(GetProcessHeap(), 0, cert); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION);

1 0