November 2007 - Wine-Commits

Thomas Weidenmueller : shell32: Use SHStrDupW in IShellFolder2:: GetDetailsOf to allocate returned string.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 4c516e63d31a846c41b77b5ecf8d84a5af268f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c516e63d31a846c41b77b5ec… Author: Thomas Weidenmueller <thomas(a)reactsoft.com> Date: Thu Nov 1 16:02:57 2007 -0600 shell32: Use SHStrDupW in IShellFolder2::GetDetailsOf to allocate returned string. --- dlls/shell32/recyclebin.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index a1ca9a6..441068f 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -439,8 +439,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS } pDetails->str.uType = STRRET_WSTR; - pDetails->str.u.pOleStr = StrDupW(buffer); - return (pDetails->str.u.pOleStr != NULL ? S_OK : E_OUTOFMEMORY); + return SHStrDupW(buffer, &pDetails->str.u.pOleStr); } static HRESULT WINAPI RecycleBin_MapColumnToSCID(IShellFolder2 *iface, UINT iColumn, SHCOLUMNID *pscid)

1 0

Chris Robinson : mshtml: Fix hkey leak.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: bc9b8d82e97ee1e78116e1b0e23b8e1886cc0495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9b8d82e97ee1e78116e1b0e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Nov 1 12:02:02 2007 -0700 mshtml: Fix hkey leak. --- dlls/mshtml/install.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index a131da6..c4404a7 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -147,6 +147,7 @@ static void set_registry(LPCSTR install_dir) res = RegSetValueExW(hkey, wszVersion, 0, REG_SZ, (LPVOID)wszIEVersion, sizeof(wszIEVersion)); + RegCloseKey(hkey); if(res != ERROR_SUCCESS) { ERR("Failed to set Version value: %d\n", res); return;

1 0

Jacek Caban : shdocvw: Move registration code to .inf file.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: ff47878863586e63b20012ddab9b3d3d32682a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff47878863586e63b20012dda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 18:50:49 2007 +0100 shdocvw: Move registration code to .inf file. --- dlls/shdocvw/Makefile.in | 1 - dlls/shdocvw/factory.c | 110 +++++++- dlls/shdocvw/regsvr.c | 724 ---------------------------------------------- dlls/shdocvw/shdocvw.inf | 105 +++++++ dlls/shdocvw/shdocvw.rc | 3 + 5 files changed, 217 insertions(+), 726 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff47878863586e63b2001…

1 0

Jacek Caban : msimtf: Fixed typos.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 8fe59229a022cf7fc86d70583f666ed0481a0ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe59229a022cf7fc86d70583… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 18:51:40 2007 +0100 msimtf: Fixed typos. --- dlls/msimtf/msimtf.inf | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msimtf/msimtf.inf b/dlls/msimtf/msimtf.inf index d7e6b73..2bc5785 100644 --- a/dlls/msimtf/msimtf.inf +++ b/dlls/msimtf/msimtf.inf @@ -14,12 +14,12 @@ DelReg=Classes.Reg HKCR,"CLSID\%CLSID_CActiveIMM%",,,"CActiveIMMApp" HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32",,,"msimtf.dll" HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident",,,"CActiveIMMAppEx_Trident" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx",,,"CActiveIMMAppEx" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%",,,"CActiveIMMAppEx_Trident" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32",,,"msimtf.dll" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx%",,,"CActiveIMMAppEx" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32",,,"msimtf.dll" +HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32","ThreadingModel",,"Apartment" [Strings] CLSID_CActiveIMMAppEx_Trident={50D5107A-D278-4871-8989-F4CEAAF59CFC}

1 0

Juan Lang : crypt32: Initialize a variable.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: b9e78cc6376495272fd3bf12829116de762db475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e78cc6376495272fd3bf128… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 10:04:18 2007 -0700 crypt32: Initialize a variable. --- dlls/crypt32/tests/encode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index be41587..f5ea461 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2034,7 +2034,7 @@ static const BYTE constraintWithDomainName[] = { 0x30, 0x32, 0x03, 0x01, 0x00, static void test_encodeBasicConstraints(DWORD dwEncoding) { DWORD i, bufSize = 0; - CERT_BASIC_CONSTRAINTS_INFO info; + CERT_BASIC_CONSTRAINTS_INFO info = { { 0 } }; CERT_NAME_BLOB nameBlob = { sizeof(encodedDomainName), (LPBYTE)encodedDomainName }; BOOL ret;

1 0

Juan Lang : crypt32: Fix a leaked key.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: e94cae61a12308bca24be1f3dc061de0bc4260fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94cae61a12308bca24be1f3d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 10:13:32 2007 -0700 crypt32: Fix a leaked key. --- dlls/crypt32/tests/encode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index f5ea461..74ebe3c 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5746,6 +5746,7 @@ static void testExportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO *pInfo) } } } + CryptDestroyKey(key); } static const BYTE expiredCert[] = { 0x30, 0x82, 0x01, 0x33, 0x30, 0x81, 0xe2,

1 0

Juan Lang : crypt32: Don' t leak buffer when a unicode string contains an invalid character.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: f64d6004944d57076e4231008829dbab3c043445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64d6004944d57076e4231008… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 10:07:11 2007 -0700 crypt32: Don't leak buffer when a unicode string contains an invalid character. --- dlls/crypt32/encode.c | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index c3d7209..6d5d152 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1579,16 +1579,19 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, pbEncoded, pcbEncoded, bytesNeeded))) { DWORD i; + BYTE *ptr; if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_NUMERICSTRING; - CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; + ptr = *(BYTE **)pbEncoded; + else + ptr = pbEncoded; + *ptr++ = ASN_NUMERICSTRING; + CRYPT_EncodeLen(encodedLen, ptr, &lenBytes); + ptr += lenBytes; for (i = 0; ret && i < encodedLen; i++) { if (isdigitW(str[i])) - *pbEncoded++ = (BYTE)str[i]; + *ptr++ = (BYTE)str[i]; else { *pcbEncoded = i; @@ -1596,6 +1599,8 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, ret = FALSE; } } + if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) + CryptMemFree(*(BYTE **)pbEncoded); } } return ret; @@ -1628,16 +1633,19 @@ static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, pbEncoded, pcbEncoded, bytesNeeded))) { DWORD i; + BYTE *ptr; if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_PRINTABLESTRING; - CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; + ptr = *(BYTE **)pbEncoded; + else + ptr = pbEncoded; + *ptr++ = ASN_PRINTABLESTRING; + CRYPT_EncodeLen(encodedLen, ptr, &lenBytes); + ptr += lenBytes; for (i = 0; ret && i < encodedLen; i++) { if (isprintableW(str[i])) - *pbEncoded++ = (BYTE)str[i]; + *ptr++ = (BYTE)str[i]; else { *pcbEncoded = i; @@ -1645,6 +1653,8 @@ static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, ret = FALSE; } } + if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) + CryptMemFree(*(BYTE **)pbEncoded); } } return ret; @@ -1670,16 +1680,19 @@ static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, pbEncoded, pcbEncoded, bytesNeeded))) { DWORD i; + BYTE *ptr; if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = ASN_IA5STRING; - CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; + ptr = *(BYTE **)pbEncoded; + else + ptr = pbEncoded; + *ptr++ = ASN_IA5STRING; + CRYPT_EncodeLen(encodedLen, ptr, &lenBytes); + ptr += lenBytes; for (i = 0; ret && i < encodedLen; i++) { if (str[i] <= 0x7f) - *pbEncoded++ = (BYTE)str[i]; + *ptr++ = (BYTE)str[i]; else { *pcbEncoded = i; @@ -1687,6 +1700,8 @@ static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, ret = FALSE; } } + if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) + CryptMemFree(*(BYTE **)pbEncoded); } } return ret;

1 0

Juan Lang : crypt32: Fix leaked chains creating the root store.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: e94ce8a0b285af500e3cebd8d01199cfff315a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94ce8a0b285af500e3cebd8d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 09:31:43 2007 -0700 crypt32: Fix leaked chains creating the root store. --- dlls/crypt32/rootstore.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index b96e456..435cbc3 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -232,21 +232,22 @@ static const char *get_cert_common_name(PCCERT_CONTEXT cert) static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to) { - PCCERT_CONTEXT cert = NULL; DWORD root_count = 0; + CERT_CHAIN_ENGINE_CONFIG chainEngineConfig = + { sizeof(chainEngineConfig), 0 }; + HCERTCHAINENGINE engine; TRACE("\n"); - do { - cert = CertEnumCertificatesInStore(from, cert); - if (cert) - { - CERT_CHAIN_ENGINE_CONFIG chainEngineConfig = - { sizeof(chainEngineConfig), 0 }; - HCERTCHAINENGINE engine = CRYPT_CreateChainEngine(to, - &chainEngineConfig); + CertDuplicateStore(to); + engine = CRYPT_CreateChainEngine(to, &chainEngineConfig); + if (engine) + { + PCCERT_CONTEXT cert = NULL; - if (engine) + do { + cert = CertEnumCertificatesInStore(from, cert); + if (cert) { CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; PCCERT_CHAIN_CONTEXT chain; @@ -275,11 +276,12 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to) CERT_STORE_ADD_NEW, NULL)) root_count++; } + CertFreeCertificateChain(chain); } - CertFreeCertificateChainEngine(engine); } - } - } while (cert); + } while (cert); + CertFreeCertificateChainEngine(engine); + } TRACE("Added %d root certificates\n", root_count); }

1 0

Juan Lang : crypt32: Use memmove rather than memcpy when addresses might overlap.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: b9dae979a40f40a7fddd0669a2216fab0ae3feb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9dae979a40f40a7fddd0669a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 09:45:49 2007 -0700 crypt32: Use memmove rather than memcpy when addresses might overlap. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 5b45358..b3808ff 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2123,7 +2123,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, { if (j < validUsages.cUsageIdentifier - 1) { - memcpy(&validUsages.rgpszUsageIdentifier[j], + memmove(&validUsages.rgpszUsageIdentifier[j], &validUsages.rgpszUsageIdentifier[j + numRemoved + 1], (validUsages.cUsageIdentifier - numRemoved

1 0

Juan Lang : crypt32: Fix a leak building an alternate chain.
by Alexandre Julliard Nov. 2, 2007

Nov. 2, 2007

Module: wine Branch: master Commit: 329761e7e179ec4b3c90664d1082b565a9f5c3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329761e7e179ec4b3c90664d1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 09:39:33 2007 -0700 crypt32: Fix a leak building an alternate chain. --- dlls/crypt32/chain.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 53588f8..5724541 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1197,6 +1197,10 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( BOOL ret = CRYPT_AddCertToSimpleChain(engine, alternate->context.rgpChain[i], alternateIssuer, infoStatus); + /* CRYPT_AddCertToSimpleChain add-ref's the issuer, so free it + * to close the enumeration that found it + */ + CertFreeCertificateContext(alternateIssuer); if (ret) { ret = CRYPT_BuildSimpleChain(engine, alternate->world,

1 0