July 2014 - Wine-commits - list.winehq.org

Piotr Caban : msi: Don't publish features with non positive install level.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 331c86f12450cfb4050fd194c5d70cf98821f9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331c86f12450cfb4050fd194c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:16 2014 +0200 msi: Don't publish features with non positive install level. --- dlls/msi/action.c | 2 ++ dlls/msi/tests/package.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4c6d6af..feb8296 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4892,6 +4892,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) BOOL absent = FALSE; MSIRECORD *uirow; + if (feature->Level <= 0) continue; + if (feature->Action != INSTALLSTATE_LOCAL && feature->Action != INSTALLSTATE_SOURCE && feature->Action != INSTALLSTATE_ADVERTISED) absent = TRUE; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 043baf9..4211e8b 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2689,6 +2689,7 @@ static void test_states(void) {'w','i','n','e','t','e','s','t','3','-','p','a','c','k','a','g','e','.','m','s','i',0}; static const WCHAR msifile4W[] = {'w','i','n','e','t','e','s','t','4','-','p','a','c','k','a','g','e','.','m','s','i',0}; + INSTALLSTATE state; MSIHANDLE hpkg; UINT r; MSIHANDLE hdb; @@ -3217,10 +3218,16 @@ static void test_states(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + /* all features installed locally */ r = MsiInstallProductA(msifile2, "ADDLOCAL=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + r = MsiOpenDatabaseW(msifile2W, MSIDBOPEN_DIRECT, &hdb); ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r);

1 0

Piotr Caban : msi: Fix feature actions overriding in process_state_property.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 0dff7bff9afd6a69340ad99a6f348740b1ea3a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dff7bff9afd6a69340ad99a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:31 2014 +0200 msi: Fix feature actions overriding in process_state_property. --- dlls/msi/action.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index feb8296..9dc804c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1666,6 +1666,8 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, { LPWSTR override; MSIFEATURE *feature; + BOOL remove = !strcmpW(property, szRemove); + BOOL reinstall = !strcmpW(property, szReinstall); override = msi_dup_property( package->db, property ); if (!override) @@ -1676,15 +1678,15 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level )) continue; - if (!strcmpW(property, szReinstall)) state = feature->Installed; + if (reinstall) + state = (feature->Installed == INSTALLSTATE_ABSENT ? INSTALLSTATE_UNKNOWN : feature->Installed); + else if (remove) + state = (feature->Installed == INSTALLSTATE_ABSENT ? INSTALLSTATE_UNKNOWN : INSTALLSTATE_ABSENT); if (!strcmpiW( override, szAll )) { - if (feature->Installed != state) - { - feature->Action = state; - feature->ActionRequest = state; - } + feature->Action = state; + feature->ActionRequest = state; } else { @@ -1698,11 +1700,8 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, if ((ptr2 && strlenW(feature->Feature) == len && !strncmpW(ptr, feature->Feature, len)) || (!ptr2 && !strcmpW(ptr, feature->Feature))) { - if (feature->Installed != state) - { - feature->Action = state; - feature->ActionRequest = state; - } + feature->Action = state; + feature->ActionRequest = state; break; } if (ptr2)

1 0

Piotr Caban : msi: Don' t check feature install level on features specified in arguments.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: b1a4055245db5cf7b8ba2e3d0d0839bfdb1ca2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a4055245db5cf7b8ba2e3d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 24 12:35:37 2014 +0200 msi: Don't check feature install level on features specified in arguments. --- dlls/msi/action.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9dc804c..41f367b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1675,7 +1675,7 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (strcmpW( property, szRemove ) && !is_feature_selected( feature, level )) + if (feature->Level <= 0) continue; if (reinstall) @@ -1838,6 +1838,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { FeatureList *fl; + if (!is_feature_selected( feature, level )) continue; + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) { if (fl->feature->Attributes & msidbFeatureAttributesFollowParent && @@ -1862,8 +1864,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) debugstr_w(feature->Feature), feature->Level, feature->Installed, feature->ActionRequest, feature->Action); - if (!is_feature_selected( feature, level )) continue; - /* features with components that have compressed files are made local */ LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) {

1 0

Francois Gouget : winetest: Standardize handling of service.cgi' s arguments and add prototypes.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: tools Branch: master Commit: 991c6c6eb454252342ed5d8d9a56f3966bddd453 URL: http://source.winehq.org/git/tools.git/?a=commit;h=991c6c6eb454252342ed5d8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 24 16:24:01 2014 +0200 winetest: Standardize handling of service.cgi's arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The functions have also been reordered so forward declarations are not necessary and are now called normally. --- winetest/service.cgi | 196 ++++++++++++++++++++++++++++----------------------- 1 file changed, 107 insertions(+), 89 deletions(-) diff --git a/winetest/service.cgi b/winetest/service.cgi index 1ec83b6..10e3c18 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -46,57 +46,56 @@ $data_root="/home/winehq/opt/winetest"; $lynx="/usr/bin/lynx"; @valid_programs=("winrash", "winetest"); -&main; -sub main { - my ($build, $urls, $cookies); - - print "Content-type: text/plain\n\n"; +########################################################################## +# +# Some convenience functions. Debug gives us output if debug=1. &read_one_line +# just opens files and returns one line, with trailing new lines removed. +# +########################################################################## - # first check for errors - my $error = cgi_error (); - if ($error) { - print $error; - exit; +# print a message if debugging is enabled +sub debug($) +{ + my ($msg) = @_; + if (param('debug')) { + print "$msg\n"; } +} - my $publish = param('publish'); - if ($publish) { - my $response = &releases_make($publish); - print "$response\n"; - exit; - } +# computes the MD5 sum of the arument +sub md5sum($) +{ + my ($string) = @_; + local $md5 = Digest::MD5->new; + $md5->add($string); + return $md5->hexdigest; +} - # for each of the programs we know about, see if they need an update - foreach $program (@valid_programs) { - ($build, $urls, $cookies) = &releases_read($program); - if (param($program)) { - my @history = split(/,/, param("$program" . "_history")); - push (@history, param($program)); - my @newhist = (); - foreach (@history) { - my ($prg, $rel) = split(/-/, $_); - if (($prg eq $program) and ($rel eq $build)) { - delete $$urls{$_}; - delete $$cookies{$_}; - push (@newhist, $_); - } - } - $winetest_history = join ',', @newhist; - } - if (scalar(%$urls)) { - &send_upgrade($urls, $winetest_history); - $update_sent = 1; - last; - } - } - if (!$update_sent) { - print "sleep 3600\n"; - return; - } +# write a string to a file +sub write_file($$) +{ + my ($filename, $content) = @_; + open(GENERIC_FH, $filename) + or ( debug("Can't open $filename for writing.") && die ); + print GENERIC_FH $content; + close(GENERIC_FH); +} +# read the content of a file +sub read_one_line($) +{ + my ($filename) = @_; + open(GENERIC_FH, $filename) + or ( debug("Can't open $filename."), die ); + $this_line = <GENERIC_FH>; + close(GENERIC_FH); + chomp $this_line; + + return $this_line; } + ########################################################################## # # When we publish, we: @@ -110,7 +109,8 @@ sub main { ########################################################################## # removes the current release from disk -sub releases_purge { +sub releases_purge($) +{ my ($project) = @_; system("rm -f $data_root/*/$project/*.cookie"); system("rm -f $data_root/*/$project/*.url"); @@ -119,7 +119,8 @@ sub releases_purge { # this function reads the current release information from disk # and returns ($thisrelease, %url, %cookies) # where the two maps are keyed by the full file name of the release -sub releases_read { +sub releases_read($) +{ my ($project) = @_; my (%urls, %cookies, $thisrelease); @@ -143,7 +144,7 @@ sub releases_read { if (scalar(%urls) == 0) { $thisrelease = $release; } elsif ($thisrelease ne $release) { - &debug("Invalid release state!") && die; + debug("Invalid release state!") && die; } $urls{$key} = $url; $cookies{$key} = $this_line; @@ -154,7 +155,8 @@ sub releases_read { } # try to add a new release to our portfolio -sub releases_make { +sub releases_make($) +{ my ($url) = @_; my ($name, $program, $build, $publisher); my ($urls, $cookies, $current_build, @other); @@ -186,43 +188,43 @@ sub releases_make { } # get current release info - ($current_build, $urls, $cookies) = &releases_read($program); + ($current_build, $urls, $cookies) = releases_read($program); # check to see how we should handle it if ($build lt $current_build) { return "Build is old, current build is $current_build"; } if ($build ne $current_build) { - &releases_purge($program); + releases_purge($program); } # check to see that the URL has the right format $base_path = "$data_root/$publisher/$program"; - $url_mask = &read_one_line("<$base_path/url.mask"); + $url_mask = read_one_line("<$base_path/url.mask"); if (!($url =~ $url_mask)) { return "Unrecognized URL format"; } # get the cookie now - $cookie = &read_one_line("$lynx -source $url.sig |"); + $cookie = read_one_line("$lynx -source $url.sig |"); # all is good, store the cookie, and URL now, this activetes the release - &write_file(">$base_path/$name.cookie", &md5sum($cookie)); - &write_file(">$base_path/$name.url", $url); + write_file(">$base_path/$name.cookie", md5sum($cookie)); + write_file(">$base_path/$name.url", $url); return "OK"; } - ########################################################################## -# +# # Issue commands understood by winrash. Try to be somewhat intelligent -# in figuring out what needs to be sent. +# in figuring out what needs to be sent. # ########################################################################## -sub send_upgrade { +sub send_upgrade($$) +{ my ($urls, $history) = @_; my (@names, $name, $url, $program); my ($build, $publisher, $id, @other); @@ -235,7 +237,7 @@ sub send_upgrade { $url = $$urls{$name}; ($program, $build, $publisher, @other) = split(/-/, $name); - &debug("Send upgrade received: $url"); + debug("Send upgrade received: $url"); print "error_url http://test.winehq.org/error\n"; print "error_sleep 3600\n"; @@ -262,45 +264,61 @@ sub send_upgrade { print "sleep 300\n"; } + ########################################################################## # -# Some convenience functions. Debug gives us output if debug=1. &read_one_line -# just opens files and returns one line, with trailing new lines removed. -# +# Main +# ########################################################################## -# print a message if debugging is enabled -sub debug { - if (param('debug')) { - print "$_[0]\n"; - } -} +sub main() +{ + my ($build, $urls, $cookies); -# computes the MD5 sum of the arument -sub md5sum { + print "Content-type: text/plain\n\n"; - local $md5 = Digest::MD5->new; - $md5->add($_[0]); - return $md5->hexdigest; -} + # first check for errors + my $error = cgi_error (); + if ($error) { + print $error; + exit; + } -# write a string to a file -sub write_file { - my ($filename, $content) = @_; - open(GENERIC_FH, $filename) - or ( &debug("Can't open $filename for writing.") && die ); - print GENERIC_FH $content; - close(GENERIC_FH); -} + my $publish = param('publish'); + if ($publish) { + my $response = releases_make($publish); + print "$response\n"; + exit; + } -# read the content of a file -sub read_one_line { - open(GENERIC_FH, $_[0]) - or ( &debug("Can't open $_[0]."), die ); - $this_line = <GENERIC_FH>; - close(GENERIC_FH); - chomp $this_line; + # for each of the programs we know about, see if they need an update + foreach $program (@valid_programs) { + ($build, $urls, $cookies) = releases_read($program); + if (param($program)) { + my @history = split(/,/, param("$program" . "_history")); + push (@history, param($program)); + my @newhist = (); + foreach (@history) { + my ($prg, $rel) = split(/-/, $_); + if (($prg eq $program) and ($rel eq $build)) { + delete $$urls{$_}; + delete $$cookies{$_}; + push (@newhist, $_); + } + } + $winetest_history = join ',', @newhist; + } + if (scalar(%$urls)) { + send_upgrade($urls, $winetest_history); + $update_sent = 1; + last; + } + } + if (!$update_sent) { + print "sleep 3600\n"; + return; + } - return $this_line; } +main();

1 0

Francois Gouget : winetest: Whitespace cleanups.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: tools Branch: master Commit: 063320d223569d9be83d5a0f72ec4d400a8d6a72 URL: http://source.winehq.org/git/tools.git/?a=commit;h=063320d223569d9be83d5a0f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 24 16:31:40 2014 +0200 winetest: Whitespace cleanups. --- winetest/dissect | 8 ++++---- winetest/error.cgi | 3 +-- winetest/gather | 2 +- winetest/service.cgi | 8 ++++---- winetest/site | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index bbd156b..676f089 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -82,7 +82,7 @@ sub create_box($$$) return $box; } -($report,undef) = glob "$queuedir/rep*/report"; +($report, undef) = glob "$queuedir/rep*/report"; exit 2 unless defined $report; ($tmpdir = $report) =~ s|^(.+)/report$|$1|; @@ -206,7 +206,7 @@ if ($plid==1 && $major==4) { } elsif ($minor == 2) { $version = "win8"; } - } + } } elsif ($plid==3) { #$version = "ce$major$minor"; } @@ -340,9 +340,9 @@ while (<IN>) { if (defined $dll) { # Either winetest crashed or the report file was cut off if ($filesize == $maxfilesize) { - mydie "report reached file limit (runaway test?)\n"; + mydie "report reached file limit (runaway test?)\n"; } else { - mydie "report truncated (winetest crash?)\n"; + mydie "report truncated (winetest crash?)\n"; } } close SUM or mydie "error writing to '$tmpdir/summary.txt': $!\n"; diff --git a/winetest/error.cgi b/winetest/error.cgi index b9692ac..ea77204 100755 --- a/winetest/error.cgi +++ b/winetest/error.cgi @@ -1,5 +1,5 @@ #!/usr/bin/perl -# +# # This script replays errors to the wine-tests-results mailing list # # Copyright (C) 2004 Brian Vincent @@ -43,4 +43,3 @@ if ($error) { print "OK\n"; } - diff --git a/winetest/gather b/winetest/gather index f469fb1..5b56b61 100755 --- a/winetest/gather +++ b/winetest/gather @@ -513,7 +513,7 @@ sub singletest($$$) { else { my $report = $group->{reports} ? $group->{reports}->[0] : $group; - $label = "$groupname $report->{tag}"; + $label = "$groupname $report->{tag}"; if (-r "$datadir/$build/$report->{dir}/$testname.html") { $href = "$report->{dir}/$testname.html"; diff --git a/winetest/service.cgi b/winetest/service.cgi index 10e3c18..53e5f10 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -1,5 +1,5 @@ #!/usr/bin/perl -# +# # This script acts as the middle man between people who build # tests to be distributed to Windows clients and the actual # Windows clients @@ -32,8 +32,8 @@ # winetest/ # <name>.url contains url to find latest winetests at, must be # writable -# url.mask contains a reg ex to match against, only needs to -# be read-only, in the above example it might be +# url.mask contains a reg ex to match against, only needs to +# be read-only, in the above example it might be # something like: http://myserver/com/path/to # <name>.cookie contains a unique identifier of a program that # winrash clients can download, must be writable @@ -99,7 +99,7 @@ sub read_one_line($) ########################################################################## # # When we publish, we: -# 1) Look for <publish key value>/url.mask that had to have been +# 1) Look for <publish key value>/url.mask that had to have been # created by a web server admin thus ensuring this program is # approved for testing # 2) Download the cookie for the program from that web server diff --git a/winetest/site b/winetest/site index a942491..16ab682 100755 --- a/winetest/site +++ b/winetest/site @@ -54,6 +54,6 @@ if ($q->param('testing')) { # redirect to data dir when no vars present my $base = $q->url(-base => 1); print $q->redirect($base . "/data/" . $build); - + # done exit();

1 0

Alexandre Julliard : configure: Improve the check for the resolver library.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 1b2977420e21bd638f9417ac65fc5f36e4d2248a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2977420e21bd638f9417ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 15:23:07 2014 +0200 configure: Improve the check for the resolver library. --- configure | 49 +++++++++++++++++++++++++++++++++---------------- configure.ac | 33 ++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/configure b/configure index d7efbfd..97a3d08 100755 --- a/configure +++ b/configure @@ -11687,11 +11687,16 @@ fi if test "$ac_cv_header_resolv_h" = "yes" then - ac_save_LIBS="$LIBS" - for lib in '' -lresolv - do - LIBS="$lib $ac_save_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolver library" >&5 +$as_echo_n "checking for resolver library... " >&6; } +if ${ac_cv_have_resolv+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_LIBS="$LIBS" + for lib in '' -lresolv + do + LIBS="$lib $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -11700,25 +11705,37 @@ then int main () { -res_query("foo",ns_c_in,0,0,0); +if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0) ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - -$as_echo "#define HAVE_RESOLV 1" >>confdefs.h - - RESOLV_LIBS="$lib" - + ac_cv_have_resolv=${lib:-"none required"} +else + ac_cv_have_resolv="not found" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "${RESOLV_LIBS+set}" = set; then - break - fi - done - LIBS="$ac_save_LIBS" + test "x$ac_cv_have_resolv" = "xnot found" || break + done + LIBS="$ac_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_resolv" >&5 +$as_echo "$ac_cv_have_resolv" >&6; } + + case "$ac_cv_have_resolv" in + "not found") ;; + "none required") + +$as_echo "#define HAVE_RESOLV 1" >>confdefs.h + ;; + *) + $as_echo "#define HAVE_RESOLV 1" >>confdefs.h + + RESOLV_LIBS=$ac_cv_have_resolv + ;; + esac fi if test "x$with_lcms2" != "xno" diff --git a/configure.ac b/configure.ac index c913f9f..872d97a 100644 --- a/configure.ac +++ b/configure.ac @@ -1419,21 +1419,28 @@ WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_port_gp_port_info_list_new" != dnl **** Check for resolver library *** if test "$ac_cv_header_resolv_h" = "yes" then - ac_save_LIBS="$LIBS" - for lib in '' -lresolv - do - LIBS="$lib $ac_save_LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H + AC_CACHE_CHECK([for resolver library], ac_cv_have_resolv, + [ac_save_LIBS="$LIBS" + for lib in '' -lresolv + do + LIBS="$lib $ac_save_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include <resolv.h>]],[[res_query("foo",ns_c_in,0,0,0);]])], - [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) - AC_SUBST(RESOLV_LIBS,"$lib")]) - if test "${RESOLV_LIBS+set}" = set; then - break - fi - done - LIBS="$ac_save_LIBS" +#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0)]])], + [ac_cv_have_resolv=${lib:-"none required"}],[ac_cv_have_resolv="not found"]) + test "x$ac_cv_have_resolv" = "xnot found" || break + done + LIBS="$ac_save_LIBS"]) + + case "$ac_cv_have_resolv" in + "not found") ;; + "none required") + AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) ;; + *) + AC_DEFINE(HAVE_RESOLV, 1) + AC_SUBST(RESOLV_LIBS,$ac_cv_have_resolv) ;; + esac fi dnl **** Check for LittleCMS ***

1 0

Alexandre Julliard : configure: Add a check for sys/ ucontext.h and include it where appropriate.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 8d817997cea784bcf784759e1d3aa93c571c500e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d817997cea784bcf784759e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 16:30:13 2014 +0200 configure: Add a check for sys/ucontext.h and include it where appropriate. --- configure | 12 ++++++------ configure.ac | 6 +++--- dlls/ntdll/server.c | 4 +++- dlls/ntdll/signal_arm.c | 6 ++++-- dlls/ntdll/signal_arm64.c | 4 +++- dlls/ntdll/signal_i386.c | 11 +++-------- dlls/ntdll/signal_powerpc.c | 9 ++++----- dlls/ntdll/signal_x86_64.c | 15 ++++----------- include/config.h.in | 6 +++--- server/ptrace.c | 4 +++- 10 files changed, 36 insertions(+), 41 deletions(-) diff --git a/configure b/configure index 97a3d08..4b8f784 100755 --- a/configure +++ b/configure @@ -6812,13 +6812,13 @@ fi done -for ac_header in ucontext.h +for ac_header in sys/ucontext.h do : - ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "#include <signal.h> + ac_fn_c_check_header_compile "$LINENO" "sys/ucontext.h" "ac_cv_header_sys_ucontext_h" "#include <signal.h> " -if test "x$ac_cv_header_ucontext_h" = xyes; then : +if test "x$ac_cv_header_sys_ucontext_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_UCONTEXT_H 1 +#define HAVE_SYS_UCONTEXT_H 1 _ACEOF fi @@ -6829,8 +6829,8 @@ done for ac_header in sys/thr.h do : ac_fn_c_check_header_compile "$LINENO" "sys/thr.h" "ac_cv_header_sys_thr_h" "#include <sys/types.h> -#ifdef HAVE_UCONTEXT_H -#include <ucontext.h> +#ifdef HAVE_SYS_UCONTEXT_H +#include <sys/ucontext.h> #endif " if test "x$ac_cv_header_sys_thr_h" = xyes; then : diff --git a/configure.ac b/configure.ac index 872d97a..a56cda0 100644 --- a/configure.ac +++ b/configure.ac @@ -631,12 +631,12 @@ AC_CHECK_HEADERS([resolv.h],,, AC_CHECK_HEADERS([ifaddrs.h],,,[#include <sys/types.h>]) -AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) +AC_CHECK_HEADERS(sys/ucontext.h,,,[#include <signal.h>]) AC_CHECK_HEADERS([sys/thr.h],,, [#include <sys/types.h> -#ifdef HAVE_UCONTEXT_H -#include <ucontext.h> +#ifdef HAVE_SYS_UCONTEXT_H +#include <sys/ucontext.h> #endif]) AC_CHECK_HEADERS([pthread_np.h],,, diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f3c6b38..aabda4f 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -63,8 +63,10 @@ #ifdef HAVE_SYS_UIO_H #include <sys/uio.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #ifdef HAVE_SYS_THR_H -#include <sys/ucontext.h> #include <sys/thr.h> #endif #ifdef HAVE_UNISTD_H diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0eb7ce0..4671b6d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -32,7 +32,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -46,6 +45,9 @@ #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -68,7 +70,7 @@ static pthread_key_t teb_key; */ #ifdef linux -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(HAVE_SYS_UCONTEXT_H) typedef struct ucontext { unsigned long uc_flags; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2b82952..69bc806 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -31,7 +31,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -45,6 +44,9 @@ #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7b4bc72..3180138 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -32,7 +32,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -43,17 +42,18 @@ # include <sys/syscall.h> # endif #endif - #ifdef HAVE_SYS_VM86_H # include <sys/vm86.h> #endif - #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -313,7 +313,6 @@ typedef struct sigcontext SIGCONTEXT; #ifdef _SCO_DS #include <sys/regset.h> #endif -#include <sys/ucontext.h> typedef struct ucontext SIGCONTEXT; #ifdef _SCO_DS @@ -357,7 +356,6 @@ typedef struct ucontext SIGCONTEXT; #define FPUX_sig(context) NULL /* FIXME */ #elif defined (__APPLE__) -# include <sys/ucontext.h> typedef ucontext_t SIGCONTEXT; @@ -407,9 +405,6 @@ typedef ucontext_t SIGCONTEXT; #endif #elif defined(__NetBSD__) -# include <sys/ucontext.h> -# include <sys/types.h> -# include <signal.h> typedef ucontext_t SIGCONTEXT; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index a457bdf..0fca342 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -28,10 +28,10 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> +#include <sys/types.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -42,10 +42,12 @@ # include <sys/syscall.h> # endif #endif - #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -94,9 +96,6 @@ static pthread_key_t teb_key; #ifdef __APPLE__ -# include <sys/ucontext.h> -# include <sys/types.h> - /* All Registers access - only for local access */ # define REG_sig(reg_name, context) ((context)->uc_mcontext->ss.reg_name) # define FLOATREG_sig(reg_name, context) ((context)->uc_mcontext->fs.reg_name) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7007db0..5658537 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -28,25 +28,22 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> - -#ifdef HAVE_UCONTEXT_H -# include <ucontext.h> -#endif - +#include <sys/types.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - #ifdef HAVE_MACHINE_SYSARCH_H # include <machine/sysarch.h> #endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif +#ifdef HAVE_SYS_UCONTEXT_H +# include <sys/ucontext.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -165,7 +162,6 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.fpregs)) #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) -#include <sys/ucontext.h> #define RAX_sig(context) ((context)->uc_mcontext.mc_rax) #define RBX_sig(context) ((context)->uc_mcontext.mc_rbx) @@ -200,9 +196,6 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.mc_fpstate)) #elif defined(__NetBSD__) -#include <sys/ucontext.h> -#include <sys/types.h> -#include <signal.h> #define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) #define RBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBX]) diff --git a/include/config.h.in b/include/config.h.in index 79f8b45..50cfcb8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1038,6 +1038,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the <sys/ucontext.h> header file. */ +#undef HAVE_SYS_UCONTEXT_H + /* Define to 1 if you have the <sys/uio.h> header file. */ #undef HAVE_SYS_UIO_H @@ -1077,9 +1080,6 @@ /* Define if you have the timezone variable */ #undef HAVE_TIMEZONE -/* Define to 1 if you have the <ucontext.h> header file. */ -#undef HAVE_UCONTEXT_H - /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H diff --git a/server/ptrace.c b/server/ptrace.c index aea821d..cb436b6 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -40,8 +40,10 @@ #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif -#ifdef HAVE_SYS_THR_H +#ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> +#endif +#ifdef HAVE_SYS_THR_H # include <sys/thr.h> #endif #include <unistd.h>

1 0

Alexandre Julliard : ntdll: Directly use ucontext_t instead of SIGCONTEXT on all platforms.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 775263aa5c4f0fe7fd8679c15c861eb5ed8768eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=775263aa5c4f0fe7fd8679c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 16:32:33 2014 +0200 ntdll: Directly use ucontext_t instead of SIGCONTEXT on all platforms. --- dlls/ntdll/signal_arm.c | 14 ++++++-------- dlls/ntdll/signal_arm64.c | 14 ++++++-------- dlls/ntdll/signal_i386.c | 41 ++++++++++++++--------------------------- 3 files changed, 26 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=775263aa5c4f0fe7fd867…

1 0

Alexandre Julliard : ntdll: Use the standard mcontext_t type for the signal context on Android.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 69d198a9eb95393851410be044245ed7b48a26f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d198a9eb95393851410be04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 19:30:14 2014 +0200 ntdll: Use the standard mcontext_t type for the signal context on Android. --- dlls/ntdll/signal_i386.c | 86 ++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 52aeb60..447e97c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -100,50 +100,58 @@ typedef struct * signal context platform-specific definitions */ -#ifdef __ANDROID__ +#ifdef __linux__ #ifndef HAVE_SYS_UCONTEXT_H + +enum +{ + REG_GS, REG_FS, REG_ES, REG_DS, REG_EDI, REG_ESI, REG_EBP, REG_ESP, + REG_EBX, REG_EDX, REG_ECX, REG_EAX, REG_TRAPNO, REG_ERR, REG_EIP, + REG_CS, REG_EFL, REG_UESP, REG_SS, NGREG +}; + +typedef int greg_t; +typedef greg_t gregset_t[NGREG]; + +struct _libc_fpreg +{ + unsigned short significand[4]; + unsigned short exponent; +}; + +struct _libc_fpstate +{ + unsigned long cw; + unsigned long sw; + unsigned long tag; + unsigned long ipoff; + unsigned long cssel; + unsigned long dataoff; + unsigned long datasel; + struct _libc_fpreg _st[8]; + unsigned long status; +}; + +typedef struct _libc_fpstate* fpregset_t; + +typedef struct +{ + gregset_t gregs; + fpregset_t fpregs; + unsigned long oldmask; + unsigned long cr2; +} mcontext_t; + typedef struct ucontext { unsigned long uc_flags; struct ucontext *uc_link; stack_t uc_stack; - struct sigcontext uc_mcontext; + mcontext_t uc_mcontext; sigset_t uc_sigmask; } ucontext_t; -#endif - -#define EAX_sig(context) ((context)->uc_mcontext.eax) -#define EBX_sig(context) ((context)->uc_mcontext.ebx) -#define ECX_sig(context) ((context)->uc_mcontext.ecx) -#define EDX_sig(context) ((context)->uc_mcontext.edx) -#define ESI_sig(context) ((context)->uc_mcontext.esi) -#define EDI_sig(context) ((context)->uc_mcontext.edi) -#define EBP_sig(context) ((context)->uc_mcontext.ebp) -#define ESP_sig(context) ((context)->uc_mcontext.esp) - -#define CS_sig(context) ((context)->uc_mcontext.cs) -#define DS_sig(context) ((context)->uc_mcontext.ds) -#define ES_sig(context) ((context)->uc_mcontext.es) -#define SS_sig(context) ((context)->uc_mcontext.ss) -#define FS_sig(context) ((context)->uc_mcontext.fs) -#define GS_sig(context) ((context)->uc_mcontext.gs) - -#define EFL_sig(context) ((context)->uc_mcontext.eflags) -#define EIP_sig(context) ((context)->uc_mcontext.eip) -#define TRAP_sig(context) ((context)->uc_mcontext.trapno) -#define ERROR_sig(context) ((context)->uc_mcontext.err) - -#define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpstate)) -#define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpstate->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) - -/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ -void rt_sigreturn(void); -__ASM_GLOBAL_FUNC( rt_sigreturn, - "movl $173,%eax\n\t" /* NR_rt_sigreturn */ - "int $0x80" ); - -#elif defined (__linux__) +#endif /* HAVE_SYS_UCONTEXT_H */ #define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX]) #define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX]) @@ -219,6 +227,14 @@ __ASM_GLOBAL_FUNC(vm86_enter, # define __HAVE_VM86 #endif +#ifdef __ANDROID__ +/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ +void rt_sigreturn(void); +__ASM_GLOBAL_FUNC( rt_sigreturn, + "movl $173,%eax\n\t" /* NR_rt_sigreturn */ + "int $0x80" ); +#endif + #elif defined (__BSDI__) #include <machine/frame.h>

1 0

Bruno Jesus : crypt32: CertGetIssuerCertificateFromStore must return error for self-signed certificates.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 7a40fdbf8cb68df269c1a1c47f6cc276ba1929e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a40fdbf8cb68df269c1a1c47… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 22 20:43:06 2014 -0300 crypt32: CertGetIssuerCertificateFromStore must return error for self-signed certificates. --- dlls/crypt32/cert.c | 6 ++++++ dlls/crypt32/chain.c | 2 +- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/tests/cert.c | 4 ---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 074b924..c35f504 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1883,6 +1883,12 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore, CertFreeCertificateContext(ret); ret = NULL; } + if (CRYPT_IsCertificateSelfSigned(pSubjectContext)) + { + CertFreeCertificateContext(ret); + ret = NULL; + SetLastError(CRYPT_E_SELF_SIGNED); + } } TRACE("returning %p\n", ret); return ret; diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 94d228a..056910f 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -265,7 +265,7 @@ typedef struct _CertificateChain LONG ref; } CertificateChain; -static BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) +BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { PCERT_EXTENSION ext; DWORD size; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 02bd902..fb5c5c3 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -337,6 +337,7 @@ WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) DECLSPEC_HIDDEN; WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) DECLSPEC_HIDDEN; +BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) DECLSPEC_HIDDEN; /* Allocates and initializes a certificate chain engine, but without creating * the root store. Instead, it uses root, and assumes the caller has done any diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a19ef1e..259361c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1728,9 +1728,7 @@ static void testGetIssuerCert(void) SetLastError(0xdeadbeef); flags = 0; parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); -todo_wine ok(!parent, "Expected NULL\n"); -todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); CertFreeCertificateContext(child); @@ -1747,9 +1745,7 @@ todo_wine ok(cert1 != NULL, "CertEnumCertificatesInStore should have worked\n"); SetLastError(0xdeadbeef); parent = CertGetIssuerCertificateFromStore(store, cert1, NULL, &flags); -todo_wine ok(!parent, "Expected NULL\n"); -todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); CertCloseStore(store, 0);

1 0