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

Alexandre Julliard : libwine: Update LD_LIBRARY_PATH in the current process from the JNI environment.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 8478cece692c1498e361388783f515f03c9ca71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8478cece692c1498e36138878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 09:24:49 2014 +0200 libwine: Update LD_LIBRARY_PATH in the current process from the JNI environment. --- libs/wine/loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 5c0192d..c2290df 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -873,6 +873,12 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo { const char *val = (*env)->GetStringUTFChars( env, val_obj, NULL ); setenv( var, val, 1 ); + if (!strcmp( var, "LD_LIBRARY_PATH" )) + { + void (*update_func)( const char * ) = dlsym( RTLD_DEFAULT, + "android_update_LD_LIBRARY_PATH" ); + if (update_func) update_func( val ); + } (*env)->ReleaseStringUTFChars( env, val_obj, val ); } else unsetenv( var );

1 0

Piotr Caban : msi: Don't publish features with non positive install level.
by Alexandre Julliard July 24, 2014

July 24, 2014

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

Daniel Lehman : cryptnet: Continue checking the revocation urls if one is offline.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 3be7f3079c125155388c21d3072263a16cc7c4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be7f3079c125155388c21d30… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 23 13:08:34 2014 -0700 cryptnet: Continue checking the revocation urls if one is offline. --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3986f0f..df9eb49 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1553,7 +1553,8 @@ static DWORD verify_cert_revocation_from_dist_points_ext( endTime = timeout = 0; if (!ret) error = GetLastError(); - for (j = 0; !error && j < urlArray->cUrl; j++) + /* continue looping if one was offline; break if revoked or timed out */ + for (j = 0; (!error || error == CRYPT_E_REVOCATION_OFFLINE) && j < urlArray->cUrl; j++) { PCCRL_CONTEXT crl;

1 0

Francois Gouget : winetest: Whitespace cleanups.
by Alexandre Julliard July 24, 2014

July 24, 2014

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

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

July 24, 2014

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

Jacek Caban : mshtml: Avoid useless PATH changes and avoid buffer overflow in set_environment.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 1bd0f4f065da6db368f57c63d9bd89e98e1677b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd0f4f065da6db368f57c63d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 16:29:48 2014 +0200 mshtml: Avoid useless PATH changes and avoid buffer overflow in set_environment. --- dlls/mshtml/nsembed.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fd87d37..0cc861f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -438,8 +438,10 @@ static BOOL install_wine_gecko(void) static void set_environment(LPCWSTR gre_path) { - WCHAR path_env[MAX_PATH], buf[20]; - int len, debug_level = 0; + size_t len, gre_path_len; + int debug_level = 0; + WCHAR *path, buf[20]; + const WCHAR *ptr; static const WCHAR pathW[] = {'P','A','T','H',0}; static const WCHAR warnW[] = {'w','a','r','n',0}; @@ -449,13 +451,6 @@ static void set_environment(LPCWSTR gre_path) {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; - /* We have to modify PATH as XPCOM loads other DLLs from this directory. */ - GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); - len = strlenW(path_env); - path_env[len++] = ';'; - strcpyW(path_env+len, gre_path); - SetEnvironmentVariableW(pathW, path_env); - SetEnvironmentVariableW(xpcom_debug_breakW, warnW); if(TRACE_ON(gecko)) @@ -467,6 +462,23 @@ static void set_environment(LPCWSTR gre_path) sprintfW(buf, debug_formatW, debug_level); SetEnvironmentVariableW(nspr_log_modulesW, buf); + + len = GetEnvironmentVariableW(pathW, NULL, 0); + gre_path_len = strlenW(gre_path); + path = heap_alloc((len+gre_path_len+1)*sizeof(WCHAR)); + if(!path) + return; + GetEnvironmentVariableW(pathW, path, len); + + /* We have to modify PATH as xul.dll loads other DLLs from this directory. */ + if(!(ptr = strstrW(path, gre_path)) + || (ptr > path && *(ptr-1) != ';') + || (ptr[gre_path_len] && ptr[gre_path_len] != ';')) { + if(len) + path[len-1] = ';'; + strcpyW(path+len, gre_path); + SetEnvironmentVariableW(pathW, path); + } } static BOOL load_xul(const PRUnichar *gre_path)

1 0

Bruno Jesus : rsaenh: Change the way AES 128 is derived to match Windows behavior.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 453d6dc105ee69df2a58c24c7cbebc9c6da0ad58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453d6dc105ee69df2a58c24c7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:48:09 2014 -0300 rsaenh: Change the way AES 128 is derived to match Windows behavior. --- dlls/rsaenh/rsaenh.c | 26 +++++++++++++++++++++++--- dlls/rsaenh/tests/rsaenh.c | 5 ----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index dd49618..0f0111b 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3926,6 +3926,8 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD switch (GET_ALG_CLASS(Algid)) { case ALG_CLASS_DATA_ENCRYPT: + { + int need_padding; *phKey = new_key(hProv, Algid, dwFlags, &pCryptKey); if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; @@ -3936,8 +3938,26 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD */ dwLen = RSAENH_MAX_HASH_SIZE; RSAENH_CPGetHashParam(pCryptHash->hProv, hBaseData, HP_HASHVAL, abHashValue, &dwLen, 0); - - if (dwLen < pCryptKey->dwKeyLen) { + + /* + * The usage of padding seems to vary from algorithm to algorithm. + * For now the only different case found was for AES with 128 bit key. + */ + switch(Algid) + { + case CALG_AES_128: + /* To reduce the chance of regressions we will only deviate + * from the old behavior for the tested hash lengths */ + if (dwLen == 16 || dwLen == 20) + { + need_padding = 1; + break; + } + default: + need_padding = dwLen < pCryptKey->dwKeyLen; + } + + if (need_padding) { BYTE pad1[RSAENH_HMAC_DEF_PAD_LEN], pad2[RSAENH_HMAC_DEF_PAD_LEN]; BYTE old_hashval[RSAENH_MAX_HASH_SIZE]; DWORD i; @@ -3966,7 +3986,7 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD memcpy(pCryptKey->abKeyValue, abHashValue, RSAENH_MIN(pCryptKey->dwKeyLen, sizeof(pCryptKey->abKeyValue))); break; - + } case ALG_CLASS_MSG_ENCRYPT: if (!lookup_handle(&handle_table, pCryptHash->hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pMasterKey)) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index dad6a27..c49bd92 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1140,9 +1140,6 @@ static void test_aes(int keylen) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); ok(result, "Expected OK, got last error %d\n", GetLastError()); ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); - if(i == 0) todo_wine - ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); - else ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); @@ -3530,9 +3527,7 @@ static void test_key_derivation(const char *prov) memset(wine_broken, 0, sizeof(wine_broken)); wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[9].exp_data = 1; wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; - wine_broken[21] = wine_broken[33] = wine_broken[45] = wine_broken[9]; for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {

1 0

Bruno Jesus : crypt32: CertGetIssuerCertificateFromStore must return error for self-signed certificates.
by Alexandre Julliard July 23, 2014

July 23, 2014

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

Alexandre Julliard : ntdll: Directly use ucontext_t instead of SIGCONTEXT on all platforms.
by Alexandre Julliard July 23, 2014

July 23, 2014

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

Jacek Caban : vbscript: Added support for title and type arguments of MsgBox.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 2c78d5815bc7b790f5285a6f1ee762b71daea8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c78d5815bc7b790f5285a6f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 18:28:28 2014 +0200 vbscript: Added support for title and type arguments of MsgBox. --- dlls/vbscript/global.c | 55 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 68fa388..dc41db5 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -282,14 +282,15 @@ static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) return obj; } -static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) +static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR orig_title, VARIANT *res) { SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_ALLOW; IActiveScriptSiteUIControl *ui_control; IActiveScriptSiteWindow *acts_window; + WCHAR *title_buf = NULL; const WCHAR *title; HWND hwnd = NULL; - int ret; + int ret = 0; HRESULT hres; hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); @@ -310,23 +311,43 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) return E_FAIL; } - title = (ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) ? vbscriptW : emptyW; - hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteWindow, (void**)&acts_window); if(FAILED(hres)) { FIXME("No IActiveScriptSiteWindow\n"); return hres; } + if(ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) { + if(orig_title && *orig_title) { + WCHAR *ptr; + + title = title_buf = heap_alloc(sizeof(vbscriptW) + (strlenW(orig_title)+2)*sizeof(WCHAR)); + if(!title) + return E_OUTOFMEMORY; + + memcpy(title_buf, vbscriptW, sizeof(vbscriptW)); + ptr = title_buf + sizeof(vbscriptW)/sizeof(WCHAR)-1; + + *ptr++ = ':'; + *ptr++ = ' '; + strcpyW(ptr, orig_title); + }else { + title = vbscriptW; + } + }else { + title = orig_title ? orig_title : emptyW; + } + hres = IActiveScriptSiteWindow_GetWindow(acts_window, &hwnd); if(SUCCEEDED(hres)) { hres = IActiveScriptSiteWindow_EnableModeless(acts_window, FALSE); if(SUCCEEDED(hres)) { - ret = MessageBoxW(hwnd, prompt, title, MB_OK); + ret = MessageBoxW(hwnd, prompt, title, type); hres = IActiveScriptSiteWindow_EnableModeless(acts_window, TRUE); } } + heap_free(title_buf); IActiveScriptSiteWindow_Release(acts_window); if(FAILED(hres)) { FIXME("failed: %08x\n", hres); @@ -1385,22 +1406,34 @@ static HRESULT Global_InputBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR prompt; + BSTR prompt, title = NULL; + int type = MB_OK; HRESULT hres; TRACE("\n"); - if(args_cnt != 1) { - FIXME("unsupported arg_cnt %d\n", args_cnt); - return E_NOTIMPL; - } + assert(1 <= args_cnt && args_cnt <= 5); hres = to_string(args, &prompt); if(FAILED(hres)) return hres; - hres = show_msgbox(This->desc->ctx, prompt, res); + if(args_cnt > 1) + hres = to_int(args+1, &type); + + if(SUCCEEDED(hres) && args_cnt > 2) + hres = to_string(args+2, &title); + + if(SUCCEEDED(hres) && args_cnt > 3) { + FIXME("unsupported arg_cnt %d\n", args_cnt); + hres = E_NOTIMPL; + } + + if(SUCCEEDED(hres)) + hres = show_msgbox(This->desc->ctx, prompt, type, title, res); + SysFreeString(prompt); + SysFreeString(title); return hres; }

1 0