November 2009 - Wine-Commits

Francois Gouget : cryptui: Remove WINAPI on the cert_mgr_sort_by_text() static function that does not need it.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 9bcd9a7eb2151af721cc5a716cd2c1f5aebcc633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd9a7eb2151af721cc5a716… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 8 10:53:06 2009 +0100 cryptui: Remove WINAPI on the cert_mgr_sort_by_text() static function that does not need it. --- dlls/cryptui/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 117257e..aefae3e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1070,8 +1070,7 @@ static void cert_mgr_do_export(HWND hwnd) } } -static int CALLBACK cert_mgr_sort_by_text(HWND lv, int col, int index1, - int index2) +static int cert_mgr_sort_by_text(HWND lv, int col, int index1, int index2) { LVITEMW item; WCHAR buf1[MAX_STRING_LEN];

1 0

Francois Gouget : winmm/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: dff253abe69e27823b35cc166731a489de12c509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff253abe69e27823b35cc166… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 8 10:53:15 2009 +0100 winmm/tests: Add a trailing '\n' to an ok() call. --- dlls/winmm/tests/mci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 5366810..f783cd6 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -420,7 +420,7 @@ static void test_asyncWAVE(HWND hwnd) ok(!err,"mci status position returned error: %d\n", err); trace("position while paused: %sms\n",buf); p1 = atoi(buf); - ok(p1>=p2,"position not increasing: %u > %u",p2,p1); + ok(p1>=p2, "position not increasing: %u > %u\n", p2, p1); err = mciSendString("stop mysound wait", NULL, 0, NULL); ok(!err,"mci stop returned error: %s\n", dbg_mcierr(err));

1 0

Marcus Meissner : ws2_32: Use correct buffer for 17 byte write.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 94efd487f0d7b3c9b7dd349099cac610a41fe05a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94efd487f0d7b3c9b7dd34909… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Nov 7 14:06:10 2009 +0100 ws2_32: Use correct buffer for 17 byte write. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 518ab4a..98b94e8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2443,7 +2443,7 @@ static void test_addr_to_print(void) /* Test longer length is ok */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst, 18); + pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 18); ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); }

1 0

Juan Lang : rsaenh: Only reverse the significant bytes of an exported public key.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

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/tests: Add round-trip test of RSA.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

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

Nicolas Le Cam : winmm/tests: Skip tests when running on non-english locale .
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 556b1ca7edf89a8677b2fad963c66284126d2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556b1ca7edf89a8677b2fad96… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Fri Nov 6 23:32:33 2009 +0100 winmm/tests: Skip tests when running on non-english locale. --- dlls/winmm/tests/mci.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6b1ecb7..5366810 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -163,9 +163,16 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"mci %s returned error: %d\n", command_open, err); ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); - err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); - ok(!err,"mci status time format returned error: %d\n", err); - ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (test with hardcoded 'milliseconds')\n"); + } + else + { + err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); + ok(!err,"mci status time format returned error: %d\n", err); + ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + } err = mciSendString(command_close_my, NULL, 0, hwnd); ok(!err,"mci %s returned error: %d\n", command_close_my, err); @@ -376,10 +383,17 @@ static void test_asyncWAVE(HWND hwnd) * will be 333ms, 667ms etc. at best. */ Sleep(100); /* milliseconds */ - buf[0]=0; - err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); - ok(!err,"mci status time format returned error: %d\n", err); - ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (test with hardcoded 'milliseconds')\n"); + } + else + { + buf[0]=0; + err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); + ok(!err,"mci status time format returned error: %d\n", err); + ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + } buf[0]=0; err = mciSendString("status mysound position", buf, sizeof(buf), hwnd);

1 0

Juan Lang : rsaenh: Only reverse the significant bytes of an exported private key.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

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

Kai Blin : secur32: Use empty credentials when cached creds fail.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: e987ec429945483908182490a0df12483f443b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e987ec429945483908182490a… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 7 11:27:54 2009 +0100 secur32: Use empty credentials when cached creds fail. --- dlls/secur32/ntlm.c | 3 +-- dlls/secur32/tests/ntlm.c | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7e44dd7..79f55e7 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -659,8 +659,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(!strncmp(buffer, "PW", 2)) { TRACE("Using cached credentials failed.\n"); - ret = SEC_E_NO_CREDENTIALS; - goto isc_end; + lstrcpynA(buffer, "PW AA==", max_len-1); } else /* Just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index b7c5105..2a66cf6 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1309,7 +1309,6 @@ static void test_null_auth_data(void) status = pInitializeSecurityContextA(&cred, NULL, (SEC_CHAR *)user, ISC_REQ_CONNECTION, 0, SECURITY_NETWORK_DREP, NULL, 0, &ctx, &buffer_desc, &attr, &ttl); - todo_wine ok(status == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed %s\n", getSecError(status)); }

1 0

Dan Kegel : wininet: FTP_FtpOpenFileW: initialize dwInternalFlags.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

Module: wine Branch: master Commit: 15d7b7b777ed7920e7227dd2c21c6c9af3dfec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d7b7b777ed7920e7227dd2c… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Nov 5 21:45:25 2009 -0800 wininet: FTP_FtpOpenFileW: initialize dwInternalFlags. --- dlls/wininet/ftp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index b0dc695..f0c3cbd 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1293,6 +1293,7 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, lpwh->hdr.vtbl = &FTPFILEVtbl; lpwh->hdr.dwFlags = dwFlags; lpwh->hdr.dwContext = dwContext; + lpwh->hdr.dwInternalFlags = 0; lpwh->hdr.refs = 1; lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwh->nDataSocket = nDataSocket;

1 0

Juan Lang : rsaenh: Explicitly clear unused memory when exporting a public key.
by Alexandre Julliard Nov. 9, 2009

Nov. 9, 2009

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