November 2009 - Wine-commits

Juan Lang : cryptnet: Fix memory leaks in tests.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 320407a174facdeb154a3a06a3d3baf652415ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=320407a174facdeb154a3a06a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 09:45:29 2009 -0800 cryptnet: Fix memory leaks in tests. --- dlls/cryptnet/tests/cryptnet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 618e494..40f66f6 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -376,10 +376,13 @@ static void test_retrieveObjectByUrl(void) skip("no usable CertificateContext\n"); return; } + CertFreeCertificateContext(cert); aux.pLastSyncTime = &ft; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); + ok(ret, "CryptRetrieveObjectByUrlA failed: %08x\n", GetLastError()); + CertFreeCertificateContext(cert); ok(ft.dwLowDateTime || ft.dwHighDateTime, "Expected last sync time to be set\n"); DeleteFileA(tmpfile);

1 0

Juan Lang : cryptnet: Fix memory leaks querying an object.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 35dbc201ae3e2540127c0efd01ac64931cbcac18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35dbc201ae3e2540127c0efd0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:11:12 2009 -0800 cryptnet: Fix memory leaks querying an object. --- dlls/cryptnet/cryptnet_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 9301a56..8a803eb 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1246,20 +1246,24 @@ static BOOL WINAPI CRYPT_CreateAny(LPCSTR pszObjectOid, if (!CertAddCertificateContextToStore(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; + CertFreeCertificateContext(context); break; case CERT_QUERY_CONTENT_CRL: if (!CertAddCRLContextToStore(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; + CertFreeCRLContext(context); break; case CERT_QUERY_CONTENT_CTL: if (!CertAddCTLContextToStore(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; + CertFreeCTLContext(context); break; default: CertAddStoreToCollection(store, contextStore, 0, 0); } + CertCloseStore(contextStore, 0); } else ret = FALSE;

1 0

Juan Lang : cryptnet: Test CertDllVerifyRevocation.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: be1fd9b3f12737320f5deacff12c3705e8ac172a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1fd9b3f12737320f5deacff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 11:54:24 2009 -0800 cryptnet: Test CertDllVerifyRevocation. --- dlls/cryptnet/tests/cryptnet.c | 205 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 205 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be1fd9b3f12737320f5de…

1 0

Juan Lang : cryptnet: Check number of contexts in CertDllVerifyRevocation.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: a82678da975e79194d7aa92c6352c117ae5342fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82678da975e79194d7aa92c6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:13:04 2009 -0800 cryptnet: Check number of contexts in CertDllVerifyRevocation. --- dlls/cryptnet/cryptnet_main.c | 5 +++++ dlls/cryptnet/tests/cryptnet.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 8a803eb..3744e68 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1467,6 +1467,11 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, SetLastError(E_INVALIDARG); return FALSE; } + if (!cContext) + { + SetLastError(E_INVALIDARG); + return FALSE; + } memset(&pRevStatus->dwIndex, 0, pRevStatus->cbSize - sizeof(DWORD)); if (dwRevType != CERT_CONTEXT_REVOCATION_TYPE) { diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index b7418e2..490e93a 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -506,19 +506,16 @@ static void test_verifyRevocation(void) } SetLastError(0xdeadbeef); ret = pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCertVerifyRevocation(X509_ASN_ENCODING, 0, 0, NULL, 0, NULL, &status); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, 0, NULL, 0, NULL, &status); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); certs[0] = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert,

1 0

Juan Lang : crypt32: Add more tests for CertVerifyRevocation.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 27128bb2f8dfc0e25e80869933d340553ceeb939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27128bb2f8dfc0e25e8086993… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:17:37 2009 -0800 crypt32: Add more tests for CertVerifyRevocation. --- dlls/crypt32/tests/cert.c | 166 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 161 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27128bb2f8dfc0e25e808…

1 0

Juan Lang : crypt32: Test revocation checking with CertGetCertificateChain.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 8ed5a777de6c9797a285829e07d7a27b3ed01257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed5a777de6c9797a285829e0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:36:55 2009 -0800 crypt32: Test revocation checking with CertGetCertificateChain. --- dlls/crypt32/tests/chain.c | 352 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 352 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ed5a777de6c9797a2858…

1 0

Juan Lang : crypt32: Fix a typo.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 9e1d31e5e52449cf4dcf6409dc4e71cf8b2a4383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d31e5e52449cf4dcf6409d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:45:46 2009 -0800 crypt32: Fix a typo. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 89c8e90..d320111 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2379,7 +2379,7 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, if (cContext) { PCCERT_CONTEXT *contexts = - CryptMemAlloc(cContext * sizeof(PCCERT_CONTEXT *)); + CryptMemAlloc(cContext * sizeof(PCCERT_CONTEXT)); if (contexts) {

1 0

Rob Shearman : oleaut32: Fix memory leak of name in ITypeLib2_Constructor_MSFT.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 2a42f4295174122f6cc1df68d62836c1250a50fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a42f4295174122f6cc1df68d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 19 11:54:32 2009 +0000 oleaut32: Fix memory leak of name in ITypeLib2_Constructor_MSFT. --- dlls/oleaut32/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ee715b6..8f552dc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2992,6 +2992,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) name = TLB_Alloc(size+1); MSFT_Read(name, size, &cx, DO_NOT_SEEK); (*ppImpLib)->name = TLB_MultiByteToBSTR(name); + TLB_Free(name); MSFT_ReadGuid(&(*ppImpLib)->guid, oGuid, &cx); offset = (offset + sizeof(INT) + sizeof(DWORD) + sizeof(LCID) + sizeof(UINT16) + size + 3) & ~3;

1 0

Rob Shearman : oleaut32: Fix a reference count leak in NonOleAutomation_GetTypeInfo.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 87c47219ae944d8ea4ff104fefc897f9de401ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c47219ae944d8ea4ff104fe… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 19 11:54:41 2009 +0000 oleaut32: Fix a reference count leak in NonOleAutomation_GetTypeInfo. Also enable a test which now works in Wine. --- dlls/oleaut32/tests/tmarshal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 7a6c49e..46f1cdc 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -915,6 +915,7 @@ static ITypeInfo *NonOleAutomation_GetTypeInfo(void) ITypeInfo *pTypeInfo; hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_INonOleAutomation, &pTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); + ITypeLib_Release(pTypeLib); return pTypeInfo; } return NULL; @@ -1260,10 +1261,8 @@ static void test_typelibmarshal(void) dispparams.cArgs = 1; dispparams.rgvarg = vararg; VariantInit(&varresult); -#if 0 /* NULL unknown not currently marshaled correctly */ hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_TYPEMISMATCH, "IDispatch_Invoke should have returned DISP_E_TYPEMISMATCH instead of 0x%08x\n", hr); -#endif VariantClear(&varresult); /* tests bad param type */

1 0

Nikolay Sivov : comctl32/listview: Compare item text on insert depending on A/W message.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: b0861921b2a4e0c72ad7389b181910f9b4b4e935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0861921b2a4e0c72ad7389b1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 19 14:46:23 2009 +0300 comctl32/listview: Compare item text on insert depending on A/W message. --- dlls/comctl32/listview.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ae658bd..d59a984 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7395,7 +7395,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, hItem = DPA_GetPtr( infoPtr->hdpaItems, i); item_s = (ITEM_INFO*)DPA_GetPtr(hItem, 0); - cmpv = textcmpWT(item_s->hdr.pszText, lpLVItem->pszText, TRUE); + cmpv = textcmpWT(item_s->hdr.pszText, lpLVItem->pszText, isW); if (infoPtr->dwStyle & LVS_SORTDESCENDING) cmpv *= -1; if (cmpv >= 0) break; @@ -10986,10 +10986,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_INSERTGROUPSORTED: */ case LVM_INSERTITEMA: - return LISTVIEW_InsertItemT(infoPtr, (LPLVITEMW)lParam, FALSE); - case LVM_INSERTITEMW: - return LISTVIEW_InsertItemT(infoPtr, (LPLVITEMW)lParam, TRUE); + return LISTVIEW_InsertItemT(infoPtr, (LPLVITEMW)lParam, uMsg == LVM_INSERTITEMW); /* case LVM_INSERTMARKHITTEST: */

1 0