wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Juan Lang : crypt32: Permit lack of key usage extension on root certificates.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: d94e4d315a573db454eb4ec3761242ff8b3c24e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94e4d315a573db454eb4ec37… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 13:12:07 2009 -0800 crypt32: Permit lack of key usage extension on root certificates. This reverts 60770fb011b0a60d7862e7fe9c7a6d24d68ac0ad, although it updates the comments to give a reason. Thanks to Matt Van Gundy for pointing it out to me. --- dlls/crypt32/chain.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c4ecfa4..c9ca356 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1083,7 +1083,7 @@ static void dump_element(PCCERT_CONTEXT cert) } static BOOL CRYPT_KeyUsageValid(PCertificateChainEngine engine, - PCCERT_CONTEXT cert, BOOL isCA, DWORD index) + PCCERT_CONTEXT cert, BOOL isRoot, BOOL isCA, DWORD index) { PCERT_EXTENSION ext; BOOL ret; @@ -1132,20 +1132,24 @@ static BOOL CRYPT_KeyUsageValid(PCertificateChainEngine engine, * perhaps this is prudent. On the other hand, MS also accepts V3 * certs without key usage extensions. We are more restrictive: * we accept locally installed V1 or V2 certs as CA certs. + * We also accept a lack of key usage extension on root certs, + * which is implied in RFC 5280, section 6.1: the trust anchor's + * only requirement is that it was used to issue the next + * certificate in the chain. */ - ret = FALSE; - if (cert->pCertInfo->dwVersion == CERT_V1 || + if (isRoot) + ret = TRUE; + else if (cert->pCertInfo->dwVersion == CERT_V1 || cert->pCertInfo->dwVersion == CERT_V2) { PCCERT_CONTEXT localCert = CRYPT_FindCertInStore( engine->hWorld, cert); - if (localCert) - { - CertFreeCertificateContext(localCert); - ret = TRUE; - } + ret = localCert != NULL; + CertFreeCertificateContext(localCert); } + else + ret = FALSE; if (!ret) WARN_(chain)("no key usage extension on a CA cert\n"); } @@ -1273,8 +1277,15 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, chain->cElement, debugstr_w(filetime_to_str(time))); for (i = chain->cElement - 1; i >= 0; i--) { + BOOL isRoot; + if (TRACE_ON(chain)) dump_element(chain->rgpElement[i]->pCertContext); + if (i == chain->cElement - 1) + isRoot = CRYPT_IsCertificateSelfSigned( + chain->rgpElement[i]->pCertContext); + else + isRoot = FALSE; if (CertVerifyTimeValidity(time, chain->rgpElement[i]->pCertContext->pCertInfo) != 0) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= @@ -1316,7 +1327,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_TRUST_INVALID_BASIC_CONSTRAINTS; } if (!CRYPT_KeyUsageValid(engine, chain->rgpElement[i]->pCertContext, - constraints.fCA, i)) + isRoot, constraints.fCA, i)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_VALID_FOR_USAGE; if (i != 0)

1 0

Juan Lang : rsaenh: Only reverse the significant bytes of an exported public key.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 27027590f8af0a5b20b43a8491a082174201efe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27027590f8af0a5b20b43a849… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 10:02:57 2009 -0800 rsaenh: Only reverse the significant bytes of an exported public key. --- dlls/rsaenh/implglue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index a36d7e7..b73eba9 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -361,7 +361,7 @@ BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen) BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen,DWORD *pdwPubExp) { mp_to_unsigned_bin(&pKeyContext->rsa.N, pbDest); - reverse_bytes(pbDest, dwKeyLen); + reverse_bytes(pbDest, mp_unsigned_bin_size(&pKeyContext->rsa.N)); if (mp_unsigned_bin_size(&pKeyContext->rsa.N) < dwKeyLen) memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.N), 0, dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.N));

1 0

Juan Lang : rsaenh: Only reverse the significant bytes of an exported private key.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 2d05074fbaf8edb4c765ad65aabdcb0929ed60a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d05074fbaf8edb4c765ad65a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 10:02:03 2009 -0800 rsaenh: Only reverse the significant bytes of an exported private key. --- dlls/rsaenh/implglue.c | 14 +++++++------- dlls/rsaenh/tests/rsaenh.c | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 118409f..a36d7e7 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -399,43 +399,43 @@ BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD DWORD *pdwPubExp) { mp_to_unsigned_bin(&pKeyContext->rsa.N, pbDest); - reverse_bytes(pbDest, dwKeyLen); + reverse_bytes(pbDest, mp_unsigned_bin_size(&pKeyContext->rsa.N)); if (mp_unsigned_bin_size(&pKeyContext->rsa.N) < dwKeyLen) memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.N), 0, dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.N)); pbDest += dwKeyLen; mp_to_unsigned_bin(&pKeyContext->rsa.p, pbDest); - reverse_bytes(pbDest, (dwKeyLen+1)>>1); + reverse_bytes(pbDest, mp_unsigned_bin_size(&pKeyContext->rsa.p)); if (mp_unsigned_bin_size(&pKeyContext->rsa.p) < (dwKeyLen+1)>>1) memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.p), 0, ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.p)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.q, pbDest); - reverse_bytes(pbDest, (dwKeyLen+1)>>1); + reverse_bytes(pbDest, mp_unsigned_bin_size(&pKeyContext->rsa.q)); if (mp_unsigned_bin_size(&pKeyContext->rsa.q) < (dwKeyLen+1)>>1) memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.q), 0, ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.q)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.dP, pbDest); - reverse_bytes(pbDest, (dwKeyLen+1)>>1); + reverse_bytes(pbDest, mp_unsigned_bin_size(&pKeyContext->rsa.dP)); if (mp_unsigned_bin_size(&pKeyContext->rsa.dP) < (dwKeyLen+1)>>1) memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.dP), 0, ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.dP)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.dQ, pbDest); - reverse_bytes(pbDest, (dwKeyLen+1)>>1); + reverse_bytes(pbDest, mp_unsigned_bin_size(&pKeyContext->rsa.dQ)); if (mp_unsigned_bin_size(&pKeyContext->rsa.dQ) < (dwKeyLen+1)>>1) memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.dQ), 0, ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.dQ)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.qP, pbDest); - reverse_bytes(pbDest, (dwKeyLen+1)>>1); + reverse_bytes(pbDest, mp_unsigned_bin_size(&pKeyContext->rsa.qP)); if (mp_unsigned_bin_size(&pKeyContext->rsa.qP) < (dwKeyLen+1)>>1) memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.qP), 0, ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.qP)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.d, pbDest); - reverse_bytes(pbDest, dwKeyLen); + reverse_bytes(pbDest, mp_unsigned_bin_size(&pKeyContext->rsa.d)); if (mp_unsigned_bin_size(&pKeyContext->rsa.d) < dwKeyLen) memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.d), 0, dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.d)); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 31f78ad..8632bbb 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1842,7 +1842,6 @@ static void test_import_export(void) ok(dwDataLen == sizeof(expected_exported_priv_key), "unexpected size %d\n", dwDataLen); - todo_wine ok(!memcmp(exported_key, expected_exported_priv_key, dwDataLen), "unexpected value\n");

1 0

Juan Lang : rsaenh/tests: Add round-trip test of RSA.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: b1beb212dbddbde8010db4ad05ce496bea8e3cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1beb212dbddbde8010db4ad0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 09:53:24 2009 -0800 rsaenh/tests: Add round-trip test of RSA. --- dlls/rsaenh/tests/rsaenh.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index efcc566..31f78ad 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2032,6 +2032,66 @@ static void test_schannel_provider(void) CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_DELETEKEYSET); } +/* Test that a key can be used to encrypt data and exported, and that, when + * the exported key is imported again, can be used to decrypt the original + * data again. + */ +static void test_rsa_round_trip(void) +{ + static const char test_string[] = "Well this is a fine how-do-you-do."; + HCRYPTPROV prov; + HCRYPTKEY signKey, keyExchangeKey; + BOOL result; + BYTE data[256], *exportedKey; + DWORD dataLen, keyLen; + + CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + + /* Generate a new key... */ + result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + result = CryptGenKey(prov, CALG_RSA_KEYX, CRYPT_EXPORTABLE, &signKey); + ok(result, "CryptGenKey with CALG_RSA_KEYX failed with error %08x\n", GetLastError()); + result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &keyExchangeKey); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); + /* encrypt some data with it... */ + memcpy(data, test_string, strlen(test_string) + 1); + dataLen = strlen(test_string) + 1; + result = CryptEncrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen, + sizeof(data)); + ok(result, "CryptEncrypt failed: %08x\n", GetLastError()); + /* export the key... */ + result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, NULL, + &keyLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exportedKey = HeapAlloc(GetProcessHeap(), 0, keyLen); + result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, exportedKey, + &keyLen); + /* destroy the key... */ + CryptDestroyKey(keyExchangeKey); + CryptDestroyKey(signKey); + /* import the key again... */ + result = CryptImportKey(prov, exportedKey, keyLen, 0, 0, &keyExchangeKey); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, exportedKey); + /* and decrypt the data encrypted with the original key with the imported + * key. + */ + result = CryptDecrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen); + ok(result, "CryptDecrypt failed: %08x\n", GetLastError()); + if (result) + { + ok(dataLen == sizeof(test_string), "unexpected size %d\n", dataLen); + ok(!memcmp(data, test_string, sizeof(test_string)), "unexpected value"); + } + CryptReleaseContext(prov, 0); + + CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); +} + static void test_enum_container(void) { BYTE abContainerName[MAX_PATH + 2]; /* Larger than maximum name len */ @@ -2494,6 +2554,7 @@ START_TEST(rsaenh) test_key_initialization(); test_schannel_provider(); test_null_provider(); + test_rsa_round_trip(); if (!init_aes_environment()) return; test_aes(128);

1 0

Juan Lang : rsaenh: Explicitly clear unused memory when exporting a public key.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 1004b57c55cd51a8ec4b50587a5e0b2d9fffa5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1004b57c55cd51a8ec4b50587… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 09:47:49 2009 -0800 rsaenh: Explicitly clear unused memory when exporting a public key. --- dlls/rsaenh/implglue.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 3477210..118409f 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -362,6 +362,9 @@ BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD { mp_to_unsigned_bin(&pKeyContext->rsa.N, pbDest); reverse_bytes(pbDest, dwKeyLen); + if (mp_unsigned_bin_size(&pKeyContext->rsa.N) < dwKeyLen) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.N), 0, + dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.N)); *pdwPubExp = (DWORD)mp_get_int(&pKeyContext->rsa.e); return TRUE; }

1 0

Juan Lang : rsaenh: Explicitly clear unused memory when exporting a private key.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 49c11910d8e0856715d14567c48a2489ff92d80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c11910d8e0856715d14567c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 09:49:00 2009 -0800 rsaenh: Explicitly clear unused memory when exporting a private key. --- dlls/rsaenh/implglue.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 68a9380..3477210 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -397,24 +397,45 @@ BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD { mp_to_unsigned_bin(&pKeyContext->rsa.N, pbDest); reverse_bytes(pbDest, dwKeyLen); + if (mp_unsigned_bin_size(&pKeyContext->rsa.N) < dwKeyLen) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.N), 0, + dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.N)); pbDest += dwKeyLen; mp_to_unsigned_bin(&pKeyContext->rsa.p, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.p) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.p), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.p)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.q, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.q) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.q), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.q)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.dP, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.dP) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.dP), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.dP)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.dQ, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.dQ) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.dQ), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.dQ)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.qP, pbDest); reverse_bytes(pbDest, (dwKeyLen+1)>>1); + if (mp_unsigned_bin_size(&pKeyContext->rsa.qP) < (dwKeyLen+1)>>1) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.qP), 0, + ((dwKeyLen+1)>>1) - mp_unsigned_bin_size(&pKeyContext->rsa.qP)); pbDest += (dwKeyLen+1)>>1; mp_to_unsigned_bin(&pKeyContext->rsa.d, pbDest); reverse_bytes(pbDest, dwKeyLen); + if (mp_unsigned_bin_size(&pKeyContext->rsa.d) < dwKeyLen) + memset(pbDest + mp_unsigned_bin_size(&pKeyContext->rsa.d), 0, + dwKeyLen - mp_unsigned_bin_size(&pKeyContext->rsa.d)); *pdwPubExp = (DWORD)mp_get_int(&pKeyContext->rsa.e); return TRUE;

1 0

Jörg Höhle : mciwave: Allow (again) to set wave format parameters prior to recording.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: de00535c13fba643c9c2bc178225be3cecafd92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de00535c13fba643c9c2bc178… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 19:04:14 2009 +0200 mciwave: Allow (again) to set wave format parameters prior to recording. --- dlls/mciwave/mciwave.c | 149 +++++++++++++++++++++--------------------------- dlls/winmm/tests/mci.c | 5 +- 2 files changed, 68 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de00535c13fba643c9c2b…

1 0

Jörg Höhle : mciwave: Set wave format PCM is the only one accepted.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 518f4f8cdb035aa7a0820448deabe533f19bae35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518f4f8cdb035aa7a0820448d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 18:31:15 2009 +0200 mciwave: Set wave format PCM is the only one accepted. --- dlls/mciwave/mciwave.c | 10 +++++----- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 0c17f32..fc1c2b2 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1310,6 +1310,11 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpPa TRACE("MCI_WAVE_SET_ANYINPUT !\n"); if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) TRACE("MCI_WAVE_SET_ANYOUTPUT !\n"); + if (dwFlags & MCI_WAVE_SET_FORMATTAG) { + TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", ((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag); + if (((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag != WAVE_FORMAT_PCM) + return MCIERR_OUTOFRANGE; + } if (dwFlags & MCI_WAVE_SET_AVGBYTESPERSEC) { wmw->wfxRef.nAvgBytesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nAvgBytesPerSec; TRACE("MCI_WAVE_SET_AVGBYTESPERSEC = %d\n", wmw->wfxRef.nAvgBytesPerSec); @@ -1326,11 +1331,6 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpPa wmw->wfxRef.nChannels = ((LPMCI_WAVE_SET_PARMS)lpParms)->nChannels; TRACE("MCI_WAVE_SET_CHANNELS = %d\n", wmw->wfxRef.nChannels); } - if (dwFlags & MCI_WAVE_SET_FORMATTAG) { - /* Dangerous because the correct cbSize cannot be set */ - wmw->wfxRef.wFormatTag = ((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag; - TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", wmw->wfxRef.wFormatTag); - } if (dwFlags & MCI_WAVE_SET_SAMPLESPERSEC) { wmw->wfxRef.nSamplesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nSamplesPerSec; TRACE("MCI_WAVE_SET_SAMPLESPERSEC = %d\n", wmw->wfxRef.nSamplesPerSec); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 59cf4ae..e84f108 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -233,7 +233,7 @@ static void test_recordWAVE(HWND hwnd) /* MCI seems to solely support PCM, no need for ACM conversion. */ err = mciSendString("set x format tag 2", NULL, 0, NULL); - todo_wine ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned error: %d\n", err); + ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned error: %d\n", err); err = mciSendString("set x format tag pcm", NULL, 0, NULL); ok(!err,"mci set format tag pcm returned error: %d\n", err);

1 0

Jörg Höhle : winmm: Do not crash on NULL MCI Sysinfo command output buffer pointer.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: f177e613380010335fb0876213d619a376deae18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f177e613380010335fb087621… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 18:41:10 2009 +0200 winmm: Do not crash on NULL MCI Sysinfo command output buffer pointer. --- dlls/winmm/mci.c | 4 ++-- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index e28a298..c6f3701 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1746,8 +1746,8 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm LPWINE_MCIDRIVER wmd; HKEY hKey; - if (lpParms == NULL || lpParms->lpstrReturn == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms->lpstrReturn == NULL) return MCIERR_PARAM_OVERFLOW; TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 4151664..59cf4ae 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -511,7 +511,7 @@ static void test_AutoOpenWAVE(HWND hwnd) /* Do not crash on NULL buffer pointer */ err = mciSendString("sysinfo waveaudio quantity open", NULL, 0, NULL); - todo_wine ok(err==MCIERR_PARAM_OVERFLOW,"mci sysinfo without buffer returned error: %d\n", err); + ok(err==MCIERR_PARAM_OVERFLOW,"mci sysinfo without buffer returned error: %d\n", err); err = mciSendString("sysinfo waveaudio quantity open", buf, sizeof(buf), NULL); ok(!err,"mci sysinfo waveaudio quantity open returned error: %d\n", err);

1 0

Jörg Höhle : winmm/tests: Add MCI waveaudio tests .
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 4aa5f5bc10a4b186cddc1a2802d3f5b2b396a7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa5f5bc10a4b186cddc1a280… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Oct 15 17:28:40 2009 +0200 winmm/tests: Add MCI waveaudio tests. --- dlls/winmm/tests/mci.c | 600 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 577 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4aa5f5bc10a4b186cddc1…

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009