August 2007 - Wine-Commits - list.winehq.org

tools/winetest dissect gather
by Jeremy Newman Aug. 22, 2007

Aug. 22, 2007

ChangeSet ID: 31334 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/22 14:44:50 Modified files: winetest : dissect gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Lay some groundwork for dll information Patch: http://cvs.winehq.org/patch.py?id=31334 Old revision New revision Changes Path 1.24 1.25 +7 -0 tools/winetest/dissect 1.28 1.29 +11 -0 tools/winetest/gather Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.24 tools/winetest/dissect:1.25 --- tools/winetest/dissect:1.24 22 Aug 2007 19:44:50 -0000 +++ tools/winetest/dissect 22 Aug 2007 19:44:50 -0000 @@ -143,6 +143,13 @@ if ($wine) { $version = "wine"; } +# Dll information is only available in new type reports +if (/^Dll info:\r?$/) { + open DLLINFO, ">$tmpdir/dllinfo.txt" or mydie "can't write $tmpdir/dllinfo.txt: $!"; + while (($_ = <IN>) =~ s/^ //) { print DLLINFO; } + close DLLINFO or mydie "error writing $tmpdir/dllinfo.txt: $!"; +} + /Test output:\r?/ or mydie "no test header: $_"; my ($unit, $test, $source, $rev, $result); my ($lines,$total, $todo, $failed, $skipped); Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.28 tools/winetest/gather:1.29 --- tools/winetest/gather:1.28 22 Aug 2007 19:44:50 -0000 +++ tools/winetest/gather 22 Aug 2007 19:44:50 -0000 @@ -76,6 +76,16 @@ foreach my $file (glob "$datadir/$build/ print "Unknown architecture: $id in file $file\n"; next; } + # Read the dll information if present (newer type reports) + my $dllinfo = "$datadir/$build/$dir/dllinfo.txt"; + if (open DLLINFO, "<$dllinfo") { + while ($_ = <DLLINFO>) { + if (/^\s*([0-9a-zA-Z_]+)=(dll is missing)\r?$/) { + $testref->{dllmissing}->{$1} = 1; + } + } + close DLLINFO; + } $testref->{tag} = @tag?"@tag":""; $testref->{dir} = $dir; if (!open TEST, "<$file") { @@ -96,6 +106,7 @@ foreach my $file (glob "$datadir/$build/ my ($digest, $unit, $test, $count, $todo, $error, $skipped, $source, $rev) = split; my $testname = "$unit:$test"; + # Leave this in for older type reports if ($test =~ /_dll_missing/) { # Mark the dll as missing on this system $testref->{dllmissing}->{$unit} = 1;

1 0

tools/winetest gather summary.css
by Jeremy Newman Aug. 22, 2007

Aug. 22, 2007

ChangeSet ID: 31333 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/22 10:55:05 Modified files: winetest : gather summary.css Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Show skip for groups in the main summary Patch: http://cvs.winehq.org/patch.py?id=31333 Old revision New revision Changes Path 1.27 1.28 +9 -2 tools/winetest/gather 1.7 1.8 +8 -0 tools/winetest/summary.css Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.27 tools/winetest/gather:1.28 --- tools/winetest/gather:1.27 22 Aug 2007 15:55: 5 -0000 +++ tools/winetest/gather 22 Aug 2007 15:55: 5 -0000 @@ -98,7 +98,7 @@ foreach my $file (glob "$datadir/$build/ my $testname = "$unit:$test"; if ($test =~ /_dll_missing/) { # Mark the dll as missing on this system - $testref->{dllmissing}->{$unit} = $unit; + $testref->{dllmissing}->{$unit} = 1; next; } $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; @@ -112,6 +112,11 @@ foreach my $file (glob "$datadir/$build/ } else { $group->{extrema}->{$testname} = [$error, $error]; } + if ($skipped > 0) { + # Mark this test as being (partly) skipped for one or more systems in the group + $group->{skipped}->{$testname} = 1; + } + } elsif ($todo eq "crash") { $testref->{crash} = $testname; } elsif ($todo eq "filelimit") { @@ -280,6 +285,7 @@ EOF } } +# Create the Main Summary foreach my $testname (sort keys %alltests) { print OUT <<"EOF"; <tr> @@ -298,8 +304,9 @@ EOF my $class = $min==0?($max==0?"pass":"mixed"):"fail"; my $title = $min==0?"":" title=\"Best: $min\""; my $errors = $min==$max?$min:"$min to $max"; + my $skip = (exists $group->{skipped}->{$testname})?"skip_":""; print OUT <<"EOF"; - <td class="$class"><a $href$title + <td class="$skip$class"><a $href$title onMouseOver="refresh('$testname','$group->{name}','-','-','$errors');" >$max</a></td> EOF Index: tools/winetest/summary.css diff -u -p tools/winetest/summary.css:1.7 tools/winetest/summary.css:1.8 --- tools/winetest/summary.css:1.7 22 Aug 2007 15:55: 5 -0000 +++ tools/winetest/summary.css 22 Aug 2007 15:55: 5 -0000 @@ -52,6 +52,14 @@ h3, p.legend { border-left-color: #60ff60; border-right-color: #0070ff; } +.skip_mixed { + background-color: #ffff40; + border-right-style: solid; + border-left-style: solid; + border-width: thick; + border-left-color: #60ff60; + border-color: #ffff40; +} .skip_fail { background-color: #ff5050; border-right-style: solid;

1 0

Juan Lang : crypt32: Test encoding a signed message with a valid public key .
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: 4fb26709cd631bc24ca27acdc47f8f7b770a56a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb26709cd631bc24ca27acdc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 21 15:14:14 2007 -0700 crypt32: Test encoding a signed message with a valid public key. --- dlls/crypt32/tests/msg.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 860058d..33b29c3 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1459,6 +1459,72 @@ static const BYTE signedWithCertWithPubKeyBareContent[] = { 0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, 0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7, 0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x00 }; +static BYTE v1CertWithValidPubKey[] = { +0x30,0x81,0xcf,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x5c,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x01,0x05,0x00,0x03,0x4b,0x00,0x30,0x48,0x02,0x41,0x00,0xe2,0x54,0x3a, +0xa7,0x83,0xb1,0x27,0x14,0x3e,0x59,0xbb,0xb4,0x53,0xe6,0x1f,0xe7,0x5d,0xf1, +0x21,0x68,0xad,0x85,0x53,0xdb,0x6b,0x1e,0xeb,0x65,0x97,0x03,0x86,0x60,0xde, +0xf3,0x6c,0x38,0x75,0xe0,0x4c,0x61,0xbb,0xbc,0x62,0x17,0xa9,0xcd,0x79,0x3f, +0x21,0x4e,0x96,0xcb,0x0e,0xdc,0x61,0x94,0x30,0x18,0x10,0x6b,0xd0,0x1c,0x10, +0x79,0x02,0x03,0x01,0x00,0x01,0xa3,0x16,0x30,0x14,0x30,0x12,0x06,0x03,0x55, +0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; +static const BYTE signedWithCertWithValidPubKeyEmptyContent[] = { +0x30,0x82,0x01,0x38,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, +0xa0,0x82,0x01,0x29,0x30,0x82,0x01,0x25,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c, +0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x02,0x06, +0x00,0xa0,0x81,0xd2,0x30,0x81,0xcf,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30, +0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61, +0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31, +0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36, +0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15, +0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e, +0x20,0x4c,0x61,0x6e,0x67,0x00,0x30,0x5c,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48, +0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x4b,0x00,0x30,0x48,0x02,0x41, +0x00,0xe2,0x54,0x3a,0xa7,0x83,0xb1,0x27,0x14,0x3e,0x59,0xbb,0xb4,0x53,0xe6, +0x1f,0xe7,0x5d,0xf1,0x21,0x68,0xad,0x85,0x53,0xdb,0x6b,0x1e,0xeb,0x65,0x97, +0x03,0x86,0x60,0xde,0xf3,0x6c,0x38,0x75,0xe0,0x4c,0x61,0xbb,0xbc,0x62,0x17, +0xa9,0xcd,0x79,0x3f,0x21,0x4e,0x96,0xcb,0x0e,0xdc,0x61,0x94,0x30,0x18,0x10, +0x6b,0xd0,0x1c,0x10,0x79,0x02,0x03,0x01,0x00,0x01,0xa3,0x16,0x30,0x14,0x30, +0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01, +0xff,0x02,0x01,0x01,0x31,0x37,0x30,0x35,0x02,0x01,0x01,0x30,0x1a,0x30,0x15, +0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e, +0x20,0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04, +0x00 }; +static const BYTE signedWithCertWithValidPubKeyContent[] = { +0x30,0x82,0x01,0x89,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, +0xa0,0x82,0x01,0x7a,0x30,0x82,0x01,0x76,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c, +0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x13,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x06,0x04,0x04,0x01, +0x02,0x03,0x04,0xa0,0x81,0xd2,0x30,0x81,0xcf,0x02,0x01,0x01,0x30,0x02,0x06, +0x00,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a, +0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36, +0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f, +0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x30,0x5c,0x30,0x0d,0x06,0x09,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x4b,0x00,0x30,0x48, +0x02,0x41,0x00,0xe2,0x54,0x3a,0xa7,0x83,0xb1,0x27,0x14,0x3e,0x59,0xbb,0xb4, +0x53,0xe6,0x1f,0xe7,0x5d,0xf1,0x21,0x68,0xad,0x85,0x53,0xdb,0x6b,0x1e,0xeb, +0x65,0x97,0x03,0x86,0x60,0xde,0xf3,0x6c,0x38,0x75,0xe0,0x4c,0x61,0xbb,0xbc, +0x62,0x17,0xa9,0xcd,0x79,0x3f,0x21,0x4e,0x96,0xcb,0x0e,0xdc,0x61,0x94,0x30, +0x18,0x10,0x6b,0xd0,0x1c,0x10,0x79,0x02,0x03,0x01,0x00,0x01,0xa3,0x16,0x30, +0x14,0x30,0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06, +0x01,0x01,0xff,0x02,0x01,0x01,0x31,0x77,0x30,0x75,0x02,0x01,0x01,0x30,0x1a, +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08, +0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05, +0x00,0x04,0x40,0x81,0xa6,0x70,0xb3,0xef,0x59,0xd1,0x66,0xd1,0x9b,0xc0,0x9a, +0xb6,0x9a,0x5e,0x6d,0x6f,0x6d,0x0d,0x59,0xa9,0xaa,0x6e,0xe9,0x2c,0xa0,0x1e, +0xee,0xc2,0x60,0xbc,0x59,0xbe,0x3f,0x63,0x06,0x8d,0xc9,0x11,0x1d,0x23,0x64, +0x92,0xef,0x2e,0xfc,0x57,0x29,0xa4,0xaf,0xe0,0xee,0x93,0x19,0x39,0x51,0xe4, +0x44,0xb8,0x0b,0x28,0xf4,0xa8,0x0d }; static void test_signed_msg_encoding(void) { @@ -1612,6 +1678,20 @@ static void test_signed_msg_encoding(void) sizeof(signedWithCertWithPubKeyBareContent)); CryptMsgClose(msg); + encodedCert.cbData = sizeof(v1CertWithValidPubKey); + encodedCert.pbData = v1CertWithValidPubKey; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + check_param("signedWithCertWithValidPubKeyEmptyContent", msg, + CMSG_CONTENT_PARAM, signedWithCertWithValidPubKeyEmptyContent, + sizeof(signedWithCertWithValidPubKeyEmptyContent)); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + check_param("signedWithCertWithValidPubKeyContent", msg, + CMSG_CONTENT_PARAM, signedWithCertWithValidPubKeyContent, + sizeof(signedWithCertWithValidPubKeyContent)); + CryptMsgClose(msg); + CryptDestroyKey(key); CryptReleaseContext(signer.hCryptProv, 0); pCryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL,

1 0

Juan Lang : crypt32: Explicitly terminate loop when a matching signer cert is found.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: 6acd76164617ecb3391a4449b88080129d756339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6acd76164617ecb3391a4449b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 21 15:13:47 2007 -0700 crypt32: Explicitly terminate loop when a matching signer cert is found. --- dlls/crypt32/msg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 2107332..3ce2bca 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2097,9 +2097,13 @@ static BOOL CDecodeSignedMsg_VerifySignature(CDecodeMsg *msg, PCERT_INFO info) ret = CertCompareCertificateName(X509_ASN_ENCODING, &msg->u.signed_data.info->rgSignerInfo[i].Issuer, &info->Issuer); if (ret) + { ret = CertCompareIntegerBlob( &msg->u.signed_data.info->rgSignerInfo[i].SerialNumber, &info->SerialNumber); + if (ret) + break; + } } if (ret) {

1 0

Juan Lang : crypt32: Only free allocated handles.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: d4c318f2952d0f0fee446ee9ca3273c9acf1e6ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c318f2952d0f0fee446ee9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 21 15:13:05 2007 -0700 crypt32: Only free allocated handles. --- dlls/crypt32/msg.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4c2c617..2107332 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -831,9 +831,12 @@ static void CSignedMsgData_CloseHandles(CSignedMsgData *msg_data) for (i = 0; i < msg_data->info->cSignerInfo; i++) { - CryptDestroyKey(msg_data->signerHandles[i].key); - CryptDestroyHash(msg_data->signerHandles[i].contentHash); - CryptDestroyHash(msg_data->signerHandles[i].authAttrHash); + if (msg_data->signerHandles[i].key) + CryptDestroyKey(msg_data->signerHandles[i].key); + if (msg_data->signerHandles[i].contentHash) + CryptDestroyHash(msg_data->signerHandles[i].contentHash); + if (msg_data->signerHandles[i].authAttrHash) + CryptDestroyHash(msg_data->signerHandles[i].authAttrHash); } CryptMemFree(msg_data->signerHandles); }

1 0

Juan Lang : crypt32: Test and implement CryptGetMessageSignerCount.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: e52c80e53b67d00750537dc87238f0e6d51ed281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52c80e53b67d00750537dc87… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 21 15:12:35 2007 -0700 crypt32: Test and implement CryptGetMessageSignerCount. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 22 ++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 12e1223..7403ca2 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -123,7 +123,7 @@ @ stdcall CryptGetDefaultOIDDllList(long long ptr ptr) @ stdcall CryptGetDefaultOIDFunctionAddress(long long wstr long ptr ptr) @ stdcall CryptGetMessageCertificates(long ptr long ptr long) -@ stub CryptGetMessageSignerCount +@ stdcall CryptGetMessageSignerCount(long ptr long) @ stdcall CryptGetOIDFunctionAddress(long long str long ptr ptr) @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) @ stdcall CryptHashCertificate(long long long ptr long ptr ptr) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 97c6b4e..4c2c617 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2286,3 +2286,25 @@ HCERTSTORE WINAPI CryptGetMessageCertificates(DWORD dwMsgAndCertEncodingType, return CertOpenStore(CERT_STORE_PROV_PKCS7, dwMsgAndCertEncodingType, hCryptProv, dwFlags, &blob); } + +LONG WINAPI CryptGetMessageSignerCount(DWORD dwMsgEncodingType, + const BYTE *pbSignedBlob, DWORD cbSignedBlob) +{ + HCRYPTMSG msg; + LONG count = -1; + + TRACE("(%08x, %p, %d)\n", dwMsgEncodingType, pbSignedBlob, cbSignedBlob); + + msg = CryptMsgOpenToDecode(dwMsgEncodingType, 0, 0, 0, NULL, NULL); + if (msg) + { + if (CryptMsgUpdate(msg, pbSignedBlob, cbSignedBlob, TRUE)) + { + DWORD size = sizeof(count); + + CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &count, &size); + } + CryptMsgClose(msg); + } + return count; +} diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b1e6c94..860058d 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2347,6 +2347,43 @@ static void test_msg_control(void) /* FIXME: need to test with a message with a valid signature and signer */ } +static void test_msg_get_signer_count(void) +{ + LONG count; + + SetLastError(0xdeadbeef); + count = CryptGetMessageSignerCount(0, NULL, 0); + ok(count == -1, "Expected -1, got %d\n", count); + ok(GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", + GetLastError()); + SetLastError(0xdeadbeef); + count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, NULL, 0); + ok(count == -1, "Expected -1, got %d\n", count); + ok(GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, + dataEmptyBareContent, sizeof(dataEmptyBareContent)); + ok(count == -1, "Expected -1, got %d\n", count); + ok(GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, + dataEmptyContent, sizeof(dataEmptyContent)); + ok(count == -1, "Expected -1, got %d\n", count); + ok(GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, + signedEmptyBareContent, sizeof(signedEmptyBareContent)); + ok(count == -1, "Expected -1, got %d\n", count); + ok(GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, + signedEmptyContent, sizeof(signedEmptyContent)); + ok(count == 1, "Expected 1, got %d\n", count); +} + START_TEST(msg) { init_function_pointers(); @@ -2363,4 +2400,7 @@ START_TEST(msg) test_hash_msg(); test_signed_msg(); test_decode_msg(); + + /* simplified message functions */ + test_msg_get_signer_count(); }

1 0

Juan Lang : crypt32: Implement CryptGetMessageCertificates.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: b9038be1ff6ca6f35db2756443cb232f7a144bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9038be1ff6ca6f35db275644… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 21 15:12:06 2007 -0700 crypt32: Implement CryptGetMessageCertificates. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index bae473c..12e1223 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -122,7 +122,7 @@ @ stub CryptGetAsyncParam @ stdcall CryptGetDefaultOIDDllList(long long ptr ptr) @ stdcall CryptGetDefaultOIDFunctionAddress(long long wstr long ptr ptr) -@ stub CryptGetMessageCertificates +@ stdcall CryptGetMessageCertificates(long ptr long ptr long) @ stub CryptGetMessageSignerCount @ stdcall CryptGetOIDFunctionAddress(long long str long ptr ptr) @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index c9226ad..97c6b4e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2273,3 +2273,16 @@ BOOL WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, pvCtrlPara); return msg->control(hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara); } + +HCERTSTORE WINAPI CryptGetMessageCertificates(DWORD dwMsgAndCertEncodingType, + HCRYPTPROV_LEGACY hCryptProv, DWORD dwFlags, const BYTE* pbSignedBlob, + DWORD cbSignedBlob) +{ + CRYPT_DATA_BLOB blob = { cbSignedBlob, (LPBYTE)pbSignedBlob }; + + TRACE("(%08x, %ld, %d08x %p, %d)\n", dwMsgAndCertEncodingType, hCryptProv, + dwFlags, pbSignedBlob, cbSignedBlob); + + return CertOpenStore(CERT_STORE_PROV_PKCS7, dwMsgAndCertEncodingType, + hCryptProv, dwFlags, &blob); +}

1 0

Juan Lang : crypt32: Trace encoding and decoding public keys on crypt channel.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: b6032a41b3c9768b3d6c47e50ea4c71c6b989fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6032a41b3c9768b3d6c47e50… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 21 15:11:09 2007 -0700 crypt32: Trace encoding and decoding public keys on crypt channel. --- dlls/crypt32/encode.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 96e94f4..05c52e6 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3627,9 +3627,9 @@ static BOOL WINAPI CRYPT_ExportRsaPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDL HCRYPTKEY key; static CHAR oid[] = szOID_RSA_RSA; - TRACE("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, dwKeySpec, - dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, pvAuxInfo, - pInfo, pcbInfo); + TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, + dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, + pvAuxInfo, pInfo, pcbInfo); if (!pszPublicKeyObjId) pszPublicKeyObjId = oid; @@ -3748,7 +3748,7 @@ static BOOL WINAPI CRYPT_ImportRsaPublicKeyInfoEx(HCRYPTPROV hCryptProv, BOOL ret; DWORD pubKeySize = 0; - TRACE("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, + TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); ret = CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB,

1 0

Alexandre Julliard : ntdll: Flesh out the stub for IOCTL_STORAGE_GET_DEVICE_NUMBER.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: ac1d912fb02503c8592fef26ee85d9ac93888421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1d912fb02503c8592fef26e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 12:01:21 2007 +0200 ntdll: Flesh out the stub for IOCTL_STORAGE_GET_DEVICE_NUMBER. --- dlls/ntdll/cdrom.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index c6e6cd3..5dc7a92 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -678,7 +678,11 @@ static NTSTATUS CDROM_GetControl(int dev, CDROM_AUDIO_CONTROL* cac) */ static NTSTATUS CDROM_GetDeviceNumber(int dev, STORAGE_DEVICE_NUMBER* devnum) { - return STATUS_NOT_SUPPORTED; + FIXME( "stub\n" ); + devnum->DeviceType = FILE_DEVICE_DISK; + devnum->DeviceNumber = 1; + devnum->PartitionNumber = 1; + return STATUS_SUCCESS; } /******************************************************************

1 0

Alexandre Julliard : user32: Thread-local hooks need a module if they don' t belong to the current process.
by Alexandre Julliard Aug. 22, 2007

Aug. 22, 2007

Module: wine Branch: master Commit: 04a9f93f6221959babec203a98f942263fa509f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a9f93f6221959babec203a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 11:59:21 2007 +0200 user32: Thread-local hooks need a module if they don't belong to the current process. --- dlls/user32/hook.c | 10 +++++++--- server/hook.c | 12 +++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index b537b7b..75e31e4 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -144,7 +144,6 @@ static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, return 0; } - /* FIXME: what if the tid belongs to another process? */ if (tid) /* thread-local hook */ { if (id == WH_JOURNALRECORD || @@ -157,18 +156,23 @@ static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - inst = 0; } else /* system-global hook */ { if (id == WH_KEYBOARD_LL || id == WH_MOUSE_LL) inst = 0; - else if (!inst || !(len = GetModuleFileNameW( inst, module, MAX_PATH )) || len >= MAX_PATH) + else if (!inst) { SetLastError( ERROR_HOOK_NEEDS_HMOD ); return 0; } } + if (inst && (!(len = GetModuleFileNameW( inst, module, MAX_PATH )) || len >= MAX_PATH)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + SERVER_START_REQ( set_hook ) { req->id = id; diff --git a/server/hook.c b/server/hook.c index c9bf3db..9a20043 100644 --- a/server/hook.c +++ b/server/hook.c @@ -420,7 +420,17 @@ DECL_HANDLER(set_hook) } else { - module = NULL; + /* module is optional only if hook is in current process */ + if (!module_size) + { + module = NULL; + if (thread->process != current->process) + { + set_error( STATUS_INVALID_PARAMETER ); + goto done; + } + } + else if (!(module = memdup( get_req_data(), module_size ))) goto done; global = 0; }

1 0