November 2009 - Wine-commits

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

09 Nov '09

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

Francois Gouget : winmm: WINMM_CheckForMMSystem() is not used, remove it.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 6f643290cf1cc28bda57a1c84379d052e0b585c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f643290cf1cc28bda57a1c84… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 8 10:57:58 2009 +0100 winmm: WINMM_CheckForMMSystem() is not used, remove it. --- dlls/winmm/winmm.c | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 677bfa3..ef993f2 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -99,34 +99,6 @@ static void WINMM_DeleteIData(void) } /****************************************************************** - * WINMM_LoadMMSystem - * - */ -static HANDLE (WINAPI *pGetModuleHandle16)(LPCSTR); -static DWORD (WINAPI *pLoadLibrary16)(LPCSTR); - -BOOL WINMM_CheckForMMSystem(void) -{ - /* 0 is not checked yet, -1 is not present, 1 is present */ - static int loaded /* = 0 */; - - if (loaded == 0) - { - HANDLE h = GetModuleHandleA("kernel32"); - loaded = -1; - if (h) - { - pGetModuleHandle16 = (void*)GetProcAddress(h, "GetModuleHandle16"); - pLoadLibrary16 = (void*)GetProcAddress(h, (LPCSTR)35); /* ordinal for LoadLibrary16 */ - if (pGetModuleHandle16 && pLoadLibrary16 && - (pGetModuleHandle16("MMSYSTEM.DLL") || pLoadLibrary16("MMSYSTEM.DLL"))) - loaded = 1; - } - } - return loaded > 0; -} - -/****************************************************************** * WINMM_ErrorToString */ const char* WINMM_ErrorToString(MMRESULT error)

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/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: 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: 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 : 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 : crypt32: Permit lack of basic constraints extension on root certificates.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 5274777b1c090d81d52e8a42a989b27b9e0ab3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5274777b1c090d81d52e8a42a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 5 13:15:43 2009 -0800 crypt32: Permit lack of basic constraints extension on root certificates. --- dlls/crypt32/chain.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c9ca356..5323ac4 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -427,6 +427,10 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, * through out-of-band means or reject the certificate." Rejecting the * certificate prohibits a large number of commonly used certificates, so * accepting locally installed ones is a compromise. + * Root certificates are also allowed to be CAs even without a basic + * constraints extension. This is implied by RFC 5280, section 6.1: the + * root of a certificate chain's only requirement is that it was used to issue + * the next certificate in the chain. * Updates chainConstraints with the element's constraints, if: * 1. chainConstraints doesn't have a path length constraint, or * 2. element's path length constraint is smaller than chainConstraints's @@ -437,12 +441,14 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, */ static BOOL CRYPT_CheckBasicConstraintsForCA(PCertificateChainEngine engine, PCCERT_CONTEXT cert, CERT_BASIC_CONSTRAINTS2_INFO *chainConstraints, - DWORD remainingCAs, BOOL *pathLengthConstraintViolated) + DWORD remainingCAs, BOOL isRoot, BOOL *pathLengthConstraintViolated) { BOOL validBasicConstraints, implicitCA = FALSE; CERT_BASIC_CONSTRAINTS2_INFO constraints; - if (cert->pCertInfo->dwVersion == CERT_V1 || + if (isRoot) + implicitCA = TRUE; + else if (cert->pCertInfo->dwVersion == CERT_V1 || cert->pCertInfo->dwVersion == CERT_V2) { BYTE hash[20]; @@ -1307,7 +1313,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_INVALID_BASIC_CONSTRAINTS; else if (!CRYPT_CheckBasicConstraintsForCA(engine, - chain->rgpElement[i]->pCertContext, &constraints, i - 1, + chain->rgpElement[i]->pCertContext, &constraints, i - 1, isRoot, &pathLengthConstraintViolated)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_INVALID_BASIC_CONSTRAINTS;

1 0

Dan Kegel : user32: Fix uninitialized variable so first call to DdeGetLastError isn' t undefined.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 75d613f64f418afafb584c794d79c9e87c0181ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d613f64f418afafb584c794… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Nov 5 19:16:34 2009 -0800 user32: Fix uninitialized variable so first call to DdeGetLastError isn't undefined. --- dlls/user32/dde_misc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 1a9b662..d2de954 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -380,6 +380,7 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, pInstance->nodeList = NULL; /* node will be added later */ pInstance->monitorFlags = afCmd & MF_MASK; pInstance->wStatus = 0; + pInstance->lastError = DMLERR_NO_ERROR; pInstance->servers = NULL; pInstance->convs[0] = NULL; pInstance->convs[1] = NULL;

1 0

Dan Kegel : wininet: FTP_FtpOpenFileW: initialize dwInternalFlags.
by Alexandre Julliard 09 Nov '09

09 Nov '09

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