February 2009 - Wine-commits

Paul Vriens : crypt32/tests: Prevent some crashes on Win9x ( test_msg_control).
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 2159580e4fb1f7a9dc2bd20b5f60e5abb7eadb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2159580e4fb1f7a9dc2bd20b5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 23 12:21:50 2009 +0100 crypt32/tests: Prevent some crashes on Win9x (test_msg_control). --- dlls/crypt32/tests/msg.c | 158 +++++++++++++++++++++++++--------------------- 1 files changed, 85 insertions(+), 73 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 40f6dfe..7794f35 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2679,27 +2679,31 @@ static void test_msg_control(void) "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); CryptMsgClose(msg); - msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, - NULL); - /* Can't verify the hash of an empty message */ - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - todo_wine - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); - /* Crashes - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, NULL); - */ - /* Can't verify the signature of a hash message */ - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, - "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); - CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), - TRUE); - /* Oddly enough, this fails */ - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - ok(!ret, "Expected failure\n"); - CryptMsgClose(msg); + if (have_nt) + { + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, + NULL); + /* Can't verify the hash of an empty message */ + SetLastError(0xdeadbeef); + /* Crashes on some Win9x */ + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + todo_wine + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + /* Crashes + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, NULL); + */ + /* Can't verify the signature of a hash message */ + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), + TRUE); + /* Oddly enough, this fails, crashes on some Win9x */ + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + ok(!ret, "Expected failure\n"); + CryptMsgClose(msg); + } msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, NULL); CryptMsgUpdate(msg, hashBareContent, sizeof(hashBareContent), TRUE); @@ -2801,63 +2805,71 @@ static void test_msg_control(void) /* This cert has a public key, but it's not in a usable form */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, NULL); - CryptMsgUpdate(msg, signedWithCertWithPubKeyBareContent, + ret = CryptMsgUpdate(msg, signedWithCertWithPubKeyBareContent, sizeof(signedWithCertWithPubKeyBareContent), TRUE); - /* Again, cert info needs to have a public key set */ - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), - "Expected CRYPT_E_ASN1_EOD or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); - /* The public key is supposed to be in encoded form.. */ - certInfo.SubjectPublicKeyInfo.Algorithm.pszObjId = oid_rsa_rsa; - certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(aKey); - certInfo.SubjectPublicKeyInfo.PublicKey.pbData = aKey; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), - "Expected CRYPT_E_ASN1_BADTAG or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); - /* but not as a X509_PUBLIC_KEY_INFO.. */ - certInfo.SubjectPublicKeyInfo.Algorithm.pszObjId = NULL; - certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(encodedPubKey); - certInfo.SubjectPublicKeyInfo.PublicKey.pbData = encodedPubKey; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && - (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), - "Expected CRYPT_E_ASN1_BADTAG or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); - /* This decodes successfully, but it doesn't match any key in the message */ - certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(mod_encoded); - certInfo.SubjectPublicKeyInfo.PublicKey.pbData = mod_encoded; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - /* In Wine's rsaenh, this fails to decode because the key length is too - * small. Not sure if that's a bug in rsaenh, so leaving todo_wine for - * now. - */ - todo_wine - ok(!ret && - (GetLastError() == NTE_BAD_SIGNATURE || - GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), - "Expected NTE_BAD_SIGNATURE or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); + if (ret) + { + /* Crashes on some Win9x */ + /* Again, cert info needs to have a public key set */ + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected CRYPT_E_ASN1_EOD or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); + /* The public key is supposed to be in encoded form.. */ + certInfo.SubjectPublicKeyInfo.Algorithm.pszObjId = oid_rsa_rsa; + certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(aKey); + certInfo.SubjectPublicKeyInfo.PublicKey.pbData = aKey; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected CRYPT_E_ASN1_BADTAG or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); + /* but not as a X509_PUBLIC_KEY_INFO.. */ + certInfo.SubjectPublicKeyInfo.Algorithm.pszObjId = NULL; + certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(encodedPubKey); + certInfo.SubjectPublicKeyInfo.PublicKey.pbData = encodedPubKey; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected CRYPT_E_ASN1_BADTAG or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); + /* This decodes successfully, but it doesn't match any key in the message */ + certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(mod_encoded); + certInfo.SubjectPublicKeyInfo.PublicKey.pbData = mod_encoded; + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + /* In Wine's rsaenh, this fails to decode because the key length is too + * small. Not sure if that's a bug in rsaenh, so leaving todo_wine for + * now. + */ + todo_wine + ok(!ret && + (GetLastError() == NTE_BAD_SIGNATURE || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected NTE_BAD_SIGNATURE or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); + } CryptMsgClose(msg); /* A message with no data doesn't have a valid signature */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); - CryptMsgUpdate(msg, signedWithCertWithValidPubKeyEmptyContent, + ret = CryptMsgUpdate(msg, signedWithCertWithValidPubKeyEmptyContent, sizeof(signedWithCertWithValidPubKeyEmptyContent), TRUE); - certInfo.SubjectPublicKeyInfo.Algorithm.pszObjId = oid_rsa_rsa; - certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(pubKey); - certInfo.SubjectPublicKeyInfo.PublicKey.pbData = pubKey; - SetLastError(0xdeadbeef); - ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && - (GetLastError() == NTE_BAD_SIGNATURE || - GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), - "Expected NTE_BAD_SIGNATURE or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); + if (ret) + { + certInfo.SubjectPublicKeyInfo.Algorithm.pszObjId = oid_rsa_rsa; + certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(pubKey); + certInfo.SubjectPublicKeyInfo.PublicKey.pbData = pubKey; + SetLastError(0xdeadbeef); + /* Crashes on some Win9x */ + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + ok(!ret && + (GetLastError() == NTE_BAD_SIGNATURE || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected NTE_BAD_SIGNATURE or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); + } CryptMsgClose(msg); /* Finally, this succeeds */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL);

1 0

Huw Davies : gdi32/tests: Don't test the height that is 1. 75 times the original font height. This is unscaled in winnt yet doubled in win9x.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 5b183a208fd0cf463b543cf47ed95231e4f9b863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b183a208fd0cf463b543cf47… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 23 11:46:21 2009 +0000 gdi32/tests: Don't test the height that is 1.75 times the original font height. This is unscaled in winnt yet doubled in win9x. --- dlls/gdi32/tests/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 5b50a14..041a742 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -354,7 +354,9 @@ static void test_bitmap_font(void) nearest_height = scale * height_orig; /* Only jump to the next height if the difference <= 25% original height */ if (scale > 2 && nearest_height - i > height_orig / 4) scale--; - /* The jump between unscaled and doubled is delayed by 1 */ + /* The jump between unscaled and doubled is delayed by 1 in winnt+ but not in win9x, + so we'll not test this particular height. */ + else if(scale == 2 && nearest_height - i == (height_orig / 4)) continue; else if(scale == 2 && nearest_height - i > (height_orig / 4 - 1)) scale--; old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale);

1 0

Paul Vriens : crypt32/tests: Prevent some crashes on Win9x (test_decode_msg ).
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 3c6fb6bb5ea2226444223bea369e28fc010859bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6fb6bb5ea2226444223bea3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 23 11:46:28 2009 +0100 crypt32/tests: Prevent some crashes on Win9x (test_decode_msg). --- dlls/crypt32/tests/msg.c | 68 +++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 2188e6d..8913db4 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2022,29 +2022,33 @@ static void test_decode_msg_update(void) ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); - msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); - /* Updating a message that has a NULL stream callback fails */ - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), - FALSE); - todo_wine - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), - "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", - GetLastError()); - /* Changing the callback pointer after the fact yields the same error (so - * the message must copy the stream info, not just store a pointer to it) - */ - streamInfo.pfnStreamOutput = nop_stream_output; - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), - FALSE); - todo_wine - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), - "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", - GetLastError()); - CryptMsgClose(msg); + if (have_nt) + { + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); + /* Updating a message that has a NULL stream callback fails */ + SetLastError(0xdeadbeef); + /* Crashes on some Win9x */ + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), + FALSE); + todo_wine + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), + "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", + GetLastError()); + /* Changing the callback pointer after the fact yields the same error (so + * the message must copy the stream info, not just store a pointer to it) + */ + streamInfo.pfnStreamOutput = nop_stream_output; + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), + FALSE); + todo_wine + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), + "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", + GetLastError()); + CryptMsgClose(msg); + } /* Empty non-final updates are allowed when streaming.. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); @@ -2353,10 +2357,14 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); - check_param("empty hash content", msg, CMSG_CONTENT_PARAM, NULL, 0); - check_param("empty hash hash data", msg, CMSG_HASH_DATA_PARAM, NULL, 0); - check_param("empty hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, - emptyHashParam, sizeof(emptyHashParam)); + if (ret) + { + /* Crashes on some Win9x */ + check_param("empty hash content", msg, CMSG_CONTENT_PARAM, NULL, 0); + check_param("empty hash hash data", msg, CMSG_HASH_DATA_PARAM, NULL, 0); + check_param("empty hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, + emptyHashParam, sizeof(emptyHashParam)); + } CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); @@ -2477,6 +2485,12 @@ static void test_decode_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, signedKeyIdEmptyContent, sizeof(signedKeyIdEmptyContent), TRUE); + if (!ret && GetLastError() == OSS_DATA_ERROR) + { + /* Subsequent tests crashes on some Win9x, so bail out */ + CryptMsgClose(msg); + return; + } ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size);

1 0

Paul Vriens : crypt32/tests: Prevent a crash on Win9x (test_data_msg).
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 2fbe5bea3b7efaa2a9d2467aaf29c818d6d7a871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fbe5bea3b7efaa2a9d2467aa… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 23 11:54:39 2009 +0100 crypt32/tests: Prevent a crash on Win9x (test_data_msg). --- dlls/crypt32/tests/msg.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8913db4..40f6dfe 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -413,18 +413,22 @@ static void test_data_msg_update(void) ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); - /* Calling update after opening with an empty stream info (with a bogus - * output function) yields an error: - */ - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, - &streamInfo); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), - "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", - GetLastError()); - CryptMsgClose(msg); + if (have_nt) + { + /* Calling update after opening with an empty stream info (with a bogus + * output function) yields an error: + */ + /* Crashes on some Win9x */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + &streamInfo); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), + "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", + GetLastError()); + CryptMsgClose(msg); + } /* Calling update with a valid output function succeeds, even if the data * exceeds the size specified in the stream info. */

1 0

Paul Vriens : crypt32/tests: Don't crash on Win9x ( test_msg_get_and_verify_signer).
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 6859eee630d3116edf3c497ee1f7171e36e99502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6859eee630d3116edf3c497ee… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 23 11:05:20 2009 +0100 crypt32/tests: Don't crash on Win9x (test_msg_get_and_verify_signer). --- dlls/crypt32/tests/msg.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index a8193cd..2188e6d 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2968,11 +2968,14 @@ static void test_msg_get_and_verify_signer(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); /* A "signed" message created with no signer cert likewise has no signer */ - CryptMsgUpdate(msg, signedEmptyContent, sizeof(signedEmptyContent), TRUE); - SetLastError(0xdeadbeef); - ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, - "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + ret = CryptMsgUpdate(msg, signedEmptyContent, sizeof(signedEmptyContent), TRUE); + if (ret) + { + /* Crashes on most Win9x */ + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + } CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL);

1 0

Alexandre Julliard : libwine: Get the reverse mapping of the Unicode default char to check for invalid chars .
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: b38b207625c36a332a564935af70040e20a2b63e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b38b207625c36a332a564935a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 15:16:35 2009 +0100 libwine: Get the reverse mapping of the Unicode default char to check for invalid chars. We can't assume that wctomb(Unicode default char) is identical to the Ansi default char. --- libs/wine/mbtowc.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libs/wine/mbtowc.c b/libs/wine/mbtowc.c index 6249e41..8b06a89 100644 --- a/libs/wine/mbtowc.c +++ b/libs/wine/mbtowc.c @@ -44,10 +44,12 @@ static inline int check_invalid_chars_sbcs( const struct sbcs_table *table, int const unsigned char *src, unsigned int srclen ) { const WCHAR * const cp2uni = (flags & MB_USEGLYPHCHARS) ? table->cp2uni_glyphs : table->cp2uni; + const WCHAR def_unicode_char = table->info.def_unicode_char; + const unsigned char def_char = table->uni2cp_low[table->uni2cp_high[def_unicode_char >> 8] + + (def_unicode_char & 0xff)]; while (srclen) { - if (cp2uni[*src] == table->info.def_unicode_char && *src != table->info.def_char) - break; + if (cp2uni[*src] == def_unicode_char && *src != def_char) break; src++; srclen--; } @@ -151,20 +153,21 @@ static inline int check_invalid_chars_dbcs( const struct dbcs_table *table, { const WCHAR * const cp2uni = table->cp2uni; const unsigned char * const cp2uni_lb = table->cp2uni_leadbytes; - + const WCHAR def_unicode_char = table->info.def_unicode_char; + const unsigned short def_char = table->uni2cp_low[table->uni2cp_high[def_unicode_char >> 8] + + (def_unicode_char & 0xff)]; while (srclen) { unsigned char off = cp2uni_lb[*src]; if (off) /* multi-byte char */ { if (srclen == 1) break; /* partial char, error */ - if (cp2uni[(off << 8) + src[1]] == table->info.def_unicode_char && - ((src[0] << 8) | src[1]) != table->info.def_char) break; + if (cp2uni[(off << 8) + src[1]] == def_unicode_char && + ((src[0] << 8) | src[1]) != def_char) break; src++; srclen--; } - else if (cp2uni[*src] == table->info.def_unicode_char && - *src != table->info.def_char) break; + else if (cp2uni[*src] == def_unicode_char && *src != def_char) break; src++; srclen--; }

1 0

Ricardo Filipe : setupapi: Implement Ok button action in SetupPromptForDiskW dialog.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 5a0079f6ca7d846b7b3b7c88e92ae267c3e9440f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0079f6ca7d846b7b3b7c88e… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Feb 18 03:46:01 2009 +0000 setupapi: Implement Ok button action in SetupPromptForDiskW dialog. --- dlls/setupapi/dialog.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index 28c8e9f..aaa9453 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -90,6 +90,40 @@ static void promptdisk_init(HWND hwnd, struct promptdisk_params *params) ShowWindow(GetDlgItem(hwnd, IDC_RUNDLG_BROWSE), SW_HIDE); } +/* When the user clicks in the Ok button in SetupPromptForDisk dialog + * if the parameters are good it copies the path from the dialog to the output buffer + * saves the required size for the buffer if PathRequiredSize is given + * returns NO_ERROR if there is no PathBuffer to copy too + * returns DPROMPT_BUFFERTOOSMALL if the path is too big to fit in PathBuffer + */ +static void promptdisk_ok(HWND hwnd, struct promptdisk_params *params) +{ + int requiredSize; + WCHAR aux[MAX_PATH]; + GetWindowTextW(GetDlgItem(hwnd, IDC_PATH), aux, MAX_PATH); + requiredSize = strlenW(aux)+1; + + if(params->PathRequiredSize) + { + *params->PathRequiredSize = requiredSize; + TRACE("returning PathRequiredSize=%d\n",*params->PathRequiredSize); + } + if(!params->PathBuffer && !params->PathBufferSize) + { + EndDialog(hwnd, NO_ERROR); + return; + } + if(params->PathBuffer && (requiredSize > params->PathBufferSize + || params->PathBufferSize < MAX_PATH)) + { + EndDialog(hwnd, DPROMPT_BUFFERTOOSMALL); + return; + } + strcpyW(params->PathBuffer, aux); + TRACE("returning PathBuffer=%s\n", debugstr_w(params->PathBuffer)); + EndDialog(hwnd, DPROMPT_SUCCESS); +} + /* When the user clicks the browse button in SetupPromptForDisk dialog * it copies the path of the selected file to the dialog path field */ @@ -126,6 +160,13 @@ static INT_PTR CALLBACK promptdisk_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: switch(wParam) { + case IDOK: + { + struct promptdisk_params *params = + (struct promptdisk_params *)GetWindowLongPtrW(hwnd, DWLP_USER); + promptdisk_ok(hwnd, params); + return TRUE; + } case IDCANCEL: EndDialog(hwnd, DPROMPT_CANCEL); return TRUE;

1 0

Ricardo Filipe : setupapi: Initiate resources of SetupPromptForDisk dialog.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: c4c05cf0133acc35bfd349071cce0af394f4f018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c05cf0133acc35bfd349071… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Feb 18 03:35:26 2009 +0000 setupapi: Initiate resources of SetupPromptForDisk dialog. --- dlls/setupapi/dialog.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index b2bca9f..826f0f8 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -47,12 +47,58 @@ struct promptdisk_params { PDWORD PathRequiredSize; }; +/* initiates the fields of the SetupPromptForDisk dialog according to the parameters +*/ +static void promptdisk_init(HWND hwnd, struct promptdisk_params *params) +{ + WCHAR format[256]; + WCHAR message[256]; + + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)params); + + if(params->DialogTitle) + SetWindowTextW(hwnd, params->DialogTitle); + if(params->PathToSource) + SetDlgItemTextW(hwnd, IDC_PATH, params->PathToSource); + + if(!(params->DiskPromptStyle & IDF_OEMDISK)) + { + LoadStringW(SETUPAPI_hInstance, IDS_PROMPTDISK, format, + sizeof(format)/sizeof(format[0])); + + if(params->DiskName) + snprintfW(message, sizeof(message)/sizeof(message[0]), format, + params->FileSought, params->DiskName); + else + { + WCHAR unknown[256]; + LoadStringW(SETUPAPI_hInstance, IDS_UNKNOWN, unknown, + sizeof(unknown)/sizeof(unknown[0])); + snprintfW(message, sizeof(message)/sizeof(message[0]), format, + params->FileSought, unknown); + } + SetDlgItemTextW(hwnd, IDC_FILENEEDED, message); + + LoadStringW(SETUPAPI_hInstance, IDS_INFO, message, + sizeof(message)/sizeof(message[0])); + SetDlgItemTextW(hwnd, IDC_INFO, message); + LoadStringW(SETUPAPI_hInstance, IDS_COPYFROM, message, + sizeof(message)/sizeof(message[0])); + SetDlgItemTextW(hwnd, IDC_COPYFROM, message); + } + if(params->DiskPromptStyle & IDF_NOBROWSE) + ShowWindow(GetDlgItem(hwnd, IDC_RUNDLG_BROWSE), SW_HIDE); +} + /* Handles the messages sent to the SetupPromptForDisk dialog */ static INT_PTR CALLBACK promptdisk_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { + case WM_INITDIALOG: + promptdisk_init(hwnd, (struct promptdisk_params *)lParam); + return TRUE; case WM_COMMAND: switch(wParam) {

1 0

Ricardo Filipe : setupapi: Enable Browse action on SetupPromptForDisk dialog.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: d80e24b8baf5c43b1a80564ba03dacd23e797de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80e24b8baf5c43b1a80564ba… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Feb 18 03:40:15 2009 +0000 setupapi: Enable Browse action on SetupPromptForDisk dialog. --- dlls/setupapi/dialog.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index 826f0f8..28c8e9f 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -90,6 +90,30 @@ static void promptdisk_init(HWND hwnd, struct promptdisk_params *params) ShowWindow(GetDlgItem(hwnd, IDC_RUNDLG_BROWSE), SW_HIDE); } +/* When the user clicks the browse button in SetupPromptForDisk dialog + * it copies the path of the selected file to the dialog path field + */ +static void promptdisk_browse(HWND hwnd, struct promptdisk_params *params) +{ + OPENFILENAMEW ofn; + ZeroMemory(&ofn, sizeof(ofn)); + + ofn.lStructSize = sizeof(ofn); + ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; + ofn.hwndOwner = hwnd; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrFile = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)); + strcpyW(ofn.lpstrFile, params->FileSought); + + if(GetOpenFileNameW(&ofn)) + { + WCHAR* last_slash = strrchrW(ofn.lpstrFile, '\\'); + if (last_slash) *last_slash = 0; + SetDlgItemTextW(hwnd, IDC_PATH, ofn.lpstrFile); + } + HeapFree(GetProcessHeap(), 0, ofn.lpstrFile); +} + /* Handles the messages sent to the SetupPromptForDisk dialog */ static INT_PTR CALLBACK promptdisk_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -105,6 +129,13 @@ static INT_PTR CALLBACK promptdisk_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case IDCANCEL: EndDialog(hwnd, DPROMPT_CANCEL); return TRUE; + case IDC_RUNDLG_BROWSE: + { + struct promptdisk_params *params = + (struct promptdisk_params *)GetWindowLongPtrW(hwnd, DWLP_USER); + promptdisk_browse(hwnd, params); + return TRUE; + } } } return FALSE;

1 0

Ricardo Filipe : setupapi: Make hinstance global for all dialogs.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 7ab7a74171ea59822013c69bc9c23f36e20da7ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab7a74171ea59822013c69bc… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Feb 18 08:39:40 2009 +0000 setupapi: Make hinstance global for all dialogs. --- dlls/setupapi/setupapi_private.h | 2 ++ dlls/setupapi/setupcab.c | 2 ++ dlls/setupapi/virtcopy.c | 9 --------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index d01edba..428cba4 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -29,6 +29,8 @@ #define REGPART_RENAME "\\Rename" #define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager" +extern HINSTANCE SETUPAPI_hInstance; + static inline WCHAR *strdupW( const WCHAR *str ) { WCHAR *ret = NULL; diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 96050e2..d879f9d 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -65,6 +65,7 @@ OSVERSIONINFOW OsVersionInfo; static HINSTANCE CABINET_hInstance = 0; +HINSTANCE SETUPAPI_hInstance = 0; static HFDI (__cdecl *sc_FDICreate)(PFNALLOC, PFNFREE, PFNOPEN, PFNREAD, PFNWRITE, PFNCLOSE, PFNSEEK, int, PERF); @@ -695,6 +696,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); if (!GetVersionExW(&OsVersionInfo)) return FALSE; + SETUPAPI_hInstance = hinstDLL; break; case DLL_PROCESS_DETACH: UnloadCABINETDll(); diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c index 9dddc88..c2fded2 100644 --- a/dlls/setupapi/virtcopy.c +++ b/dlls/setupapi/virtcopy.c @@ -43,8 +43,6 @@ static BOOL VCP_opened = FALSE; static VCPSTATUS vcp_status; -static HINSTANCE SETUPAPI_hInstance; - static WORD VCP_Callback( LPVOID obj, UINT16 msg, WPARAM16 wParam, LPARAM lParam, LPARAM lParamRef ) { WORD args[8]; @@ -308,13 +306,6 @@ RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef) VCP_Proc = (FARPROC16)vifproc; VCP_MsgRef = lparamMsgRef; - /* load SETUPAPI needed for dialog resources etc. */ - SETUPAPI_hInstance = GetModuleHandleA("setupapi.dll"); - if (!SETUPAPI_hInstance) - { - ERR("Could not load sibling setupapi.dll\n"); - return ERR_VCP_NOMEM; - } VCP_opened = TRUE; return OK; }

1 0