November 2009 - Wine-Commits

Vincent Povirk : ole32: Invalidate open storage objects that outlive their parent.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: d3c0a3a829f0a01da4627f6ada36f0054ad3d6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c0a3a829f0a01da4627f6ad… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 19 13:42:47 2009 -0600 ole32: Invalidate open storage objects that outlive their parent. --- dlls/ole32/storage32.c | 75 ++++++++++++++++++++++++++++++++++++++--- dlls/ole32/storage32.h | 5 +++ dlls/ole32/tests/storage32.c | 4 +- 3 files changed, 76 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8613aa8..269f611 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -77,9 +77,11 @@ static const char rootEntryName[] = "Root Entry"; struct StorageInternalImpl { struct StorageBaseImpl base; + /* - * There is no specific data for this class. + * Entry in the parent's stream tracking list */ + struct list ParentListEntry; }; typedef struct StorageInternalImpl StorageInternalImpl; @@ -111,6 +113,7 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( StorageImpl* This, ULONG blockIndex, ULONG offset, DWORD* value); static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEntry); +static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ); /* OLESTREAM memory structure to use for Get and Put Routines */ /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */ @@ -428,6 +431,12 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( goto end; } + if (!This->ancestorStorage) + { + res = STG_E_REVERTED; + goto end; + } + /* * Check that we're compatible with the parent's storage mode, but * only if we are not in transacted mode @@ -544,6 +553,9 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( goto end; } + if (!This->ancestorStorage) + return STG_E_REVERTED; + /* * Check that we're compatible with the parent's storage mode, * but only if we are not transacted @@ -578,6 +590,8 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( StorageBaseImpl_AddRef(*ppstg); + list_add_tail(&This->storageHead, &newStorage->ParentListEntry); + res = S_OK; goto end; } @@ -617,6 +631,9 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( if ( (This==0) || (ppenum==0)) return E_INVALIDARG; + if (!This->ancestorStorage) + return STG_E_REVERTED; + newEnum = IEnumSTATSTGImpl_Construct( This->ancestorStorage, This->storageDirEntry); @@ -659,6 +676,12 @@ static HRESULT WINAPI StorageBaseImpl_Stat( goto end; } + if (!This->ancestorStorage) + { + res = STG_E_REVERTED; + goto end; + } + readSuccessful = StorageImpl_ReadDirEntry( This->ancestorStorage, This->storageDirEntry, @@ -708,6 +731,9 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( TRACE("(%p, %s, %s)\n", iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName)); + if (!This->ancestorStorage) + return STG_E_REVERTED; + currentEntryRef = findElement(This->ancestorStorage, This->storageDirEntry, pwcsNewName, @@ -801,6 +827,9 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( if (STGM_SHARE_MODE(grfMode) != STGM_SHARE_EXCLUSIVE) return STG_E_INVALIDFLAG; + if (!This->ancestorStorage) + return STG_E_REVERTED; + /* * As documented. */ @@ -929,6 +958,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( TRACE("(%p, %p)\n", iface, clsid); + if (!This->ancestorStorage) + return STG_E_REVERTED; + success = StorageImpl_ReadDirEntry(This->ancestorStorage, This->storageDirEntry, &currentEntry); @@ -992,6 +1024,9 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( return STG_E_INVALIDFLAG; } + if (!This->ancestorStorage) + return STG_E_REVERTED; + /* * Check that we're compatible with the parent's storage mode */ @@ -1731,6 +1766,9 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if (pwcsName==NULL) return STG_E_INVALIDPOINTER; + if (!This->ancestorStorage) + return STG_E_REVERTED; + if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) return STG_E_ACCESSDENIED; @@ -1841,13 +1879,19 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) { struct list *cur, *cur2; StgStreamImpl *strm=NULL; + StorageInternalImpl *childstg=NULL; LIST_FOR_EACH_SAFE(cur, cur2, &stg->strmHead) { strm = LIST_ENTRY(cur,StgStreamImpl,StrmListEntry); - TRACE("Streams deleted (stg=%p strm=%p next=%p prev=%p)\n", stg,strm,cur->next,cur->prev); + TRACE("Streams invalidated (stg=%p strm=%p next=%p prev=%p)\n", stg,strm,cur->next,cur->prev); strm->parentStorage = NULL; list_remove(cur); } + + LIST_FOR_EACH_SAFE(cur, cur2, &stg->storageHead) { + childstg = LIST_ENTRY(cur,StorageInternalImpl,ParentListEntry); + StorageInternalImpl_Invalidate( childstg ); + } } @@ -2120,6 +2164,10 @@ static HRESULT WINAPI StorageBaseImpl_SetStateBits( DWORD grfMask) /* [in] */ { StorageBaseImpl* const This = (StorageBaseImpl*)iface; + + if (!This->ancestorStorage) + return STG_E_REVERTED; + This->stateBits = (This->stateBits & ~grfMask) | (grfStateBits & grfMask); return S_OK; } @@ -2170,6 +2218,8 @@ static HRESULT StorageImpl_Construct( list_init(&This->base.strmHead); + list_init(&This->base.storageHead); + This->base.lpVtbl = &Storage32Impl_Vtbl; This->base.pssVtbl = &IPropertySetStorage_Vtbl; This->base.v_destructor = StorageImpl_Destroy; @@ -3512,11 +3562,25 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( return SmallBlockChainStream_Construct(This, NULL, streamEntryRef); } +static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ) +{ + if (This->base.ancestorStorage) + { + TRACE("Storage invalidated (stg=%p)\n", This); + + This->base.ancestorStorage = NULL; + + StorageBaseImpl_DeleteAll(&This->base); + + list_remove(&This->ParentListEntry); + } +} + static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; - StorageBaseImpl_DeleteAll(&This->base); + StorageInternalImpl_Invalidate(This); HeapFree(GetProcessHeap(), 0, This); } @@ -3975,11 +4039,10 @@ static StorageInternalImpl* StorageInternalImpl_Construct( if (newStorage!=0) { - /* - * Initialize the stream list - */ list_init(&newStorage->base.strmHead); + list_init(&newStorage->base.storageHead); + /* * Initialize the virtual function table. */ diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 8060acf..4a953c1 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -202,6 +202,11 @@ struct StorageBaseImpl struct list strmHead; /* + * Storage tracking list + */ + struct list storageHead; + + /* * Reference count of this object */ LONG ref; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 2e80b6e..d11f179 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1335,10 +1335,10 @@ static void test_parent_free(void) IStream_Release(stm); r = IStorage_Stat(stg3, &statstg, STATFLAG_NONAME); - todo_wine ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); + ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); r = IStorage_SetStateBits(stg3, 1, 1); - todo_wine ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); + ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); IStorage_Release(stg3); }

1 0

Juan Lang : crypt32: CertFindCRLInStore with find type CRL_FIND_ISSUED_FOR shouldn' t check whether the CRL is valid for the subject certificate.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 9d9070ae3cb6ca7a13847fa5ff00663e42af855b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9070ae3cb6ca7a13847fa5f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 11:50:32 2009 -0800 crypt32: CertFindCRLInStore with find type CRL_FIND_ISSUED_FOR shouldn't check whether the CRL is valid for the subject certificate. --- dlls/crypt32/crl.c | 3 --- dlls/crypt32/tests/crl.c | 2 -- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 5b93d3a..9e7fe9d 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -177,9 +177,6 @@ static BOOL compare_crl_issued_for(PCCRL_CONTEXT pCrlContext, DWORD dwType, ret = CertCompareCertificateName(para->pIssuerCert->dwCertEncodingType, &para->pIssuerCert->pCertInfo->Issuer, &pCrlContext->pCrlInfo->Issuer); - if (ret) - ret = CertIsValidCRLForCertificate(para->pSubjectCert, pCrlContext, - 0, NULL); return ret; } diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index dfb9356..4a96a46 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -530,7 +530,6 @@ static void testFindCRL(void) * match cert's issuer, but verisignCRL does not, so the expected count * is 0. */ - todo_wine { ok(count == 3 || broken(count == 0 /* NT4, Win9x */), "expected 3 matching CRLs, got %d\n", count); /* Only v1CRLWithIssuerAndEntry and v2CRLWithIssuingDistPoint contain @@ -538,7 +537,6 @@ static void testFindCRL(void) */ ok(revoked_count == 2 || broken(revoked_count == 0 /* NT4, Win9x */), "expected 2 matching CRL entries, got %d\n", revoked_count); - } CertFreeCertificateContext(cert);

1 0

Vincent Povirk : ole32: Add test for freeing the parent of a storage.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: 3cd2a80eda8cacce230890a298cedad354d66d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd2a80eda8cacce230890a29… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 19 13:13:57 2009 -0600 ole32: Add test for freeing the parent of a storage. --- dlls/ole32/tests/storage32.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 75c0dae..2e80b6e 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1290,12 +1290,13 @@ static void test_revert(void) static void test_parent_free(void) { - IStorage *stg = NULL, *stg2 = NULL; + IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; HRESULT r; IStream *stm = NULL; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; ULONG ref; + STATSTG statstg; DeleteFileA(filenameA); @@ -1304,7 +1305,7 @@ static void test_parent_free(void) STGM_READWRITE |STGM_TRANSACTED, 0, &stg); ok(r==S_OK, "StgCreateDocfile failed\n"); - /* commit a new storage */ + /* create a new storage */ r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); @@ -1314,15 +1315,32 @@ static void test_parent_free(void) r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + { + /* create a storage inside the new storage */ + r = IStorage_CreateStorage(stg2, stgname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stg3 ); + ok(r==S_OK, "IStorage->CreateStorage failed\n"); + } + + /* free the parent */ ref = IStorage_Release(stg2); ok(ref == 0, "IStorage still has %u references\n", ref); + /* child objects are invalid */ if (r == S_OK) { r = IStream_Write(stm, "this should fail\n", 17, NULL); ok(r==STG_E_REVERTED, "IStream->Write sould fail, hr=%x\n", r); IStream_Release(stm); + + r = IStorage_Stat(stg3, &statstg, STATFLAG_NONAME); + todo_wine ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); + + r = IStorage_SetStateBits(stg3, 1, 1); + todo_wine ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); + + IStorage_Release(stg3); } }

1 0

Vincent Povirk : ole32: Forbid opening the same storage twice.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: c62a4ad8413937c0dc7589276c1e920de5d50dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62a4ad8413937c0dc7589276… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 19 13:55:34 2009 -0600 ole32: Forbid opening the same storage twice. --- dlls/ole32/storage32.c | 23 +++++++++++++++++++++++ dlls/ole32/tests/storage32.c | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 269f611..773855f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -113,6 +113,7 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( StorageImpl* This, ULONG blockIndex, ULONG offset, DWORD* value); static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEntry); +static BOOL StorageBaseImpl_IsStorageOpen(StorageBaseImpl * stg, DirRef storageEntry); static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ); /* OLESTREAM memory structure to use for Get and Put Routines */ @@ -579,6 +580,13 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( if ( (storageEntryRef!=DIRENTRY_NULL) && (currentEntry.stgType==STGTY_STORAGE) ) { + if (StorageBaseImpl_IsStorageOpen(This, storageEntryRef)) + { + /* A single storage cannot be opened a second time. */ + res = STG_E_ACCESSDENIED; + goto end; + } + newStorage = StorageInternalImpl_Construct( This->ancestorStorage, grfMode, @@ -1875,6 +1883,21 @@ static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEnt return FALSE; } +static BOOL StorageBaseImpl_IsStorageOpen(StorageBaseImpl * stg, DirRef storageEntry) +{ + StorageInternalImpl *childstg; + + LIST_FOR_EACH_ENTRY(childstg, &stg->storageHead, StorageInternalImpl, ParentListEntry) + { + if (childstg->base.storageDirEntry == storageEntry) + { + return TRUE; + } + } + + return FALSE; +} + static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) { struct list *cur, *cur2; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d11f179..42741ac 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1060,13 +1060,13 @@ static void test_substorage_share(void) if (r == S_OK) { r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); - todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage should fail %08x\n", r); + ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage should fail %08x\n", r); if (r == S_OK) IStorage_Release(stg3); r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); - todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage should fail %08x\n", r); + ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStorage should fail %08x\n", r); if (r == S_OK) IStorage_Release(stg3);

1 0

Juan Lang : crypt32: Assume revocation server is offline if revocation status isn't known.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: a3c6bc68c815ee4a3ac6f33d74ddf065a7dc0fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c6bc68c815ee4a3ac6f33d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:49:31 2009 -0800 crypt32: Assume revocation server is offline if revocation status isn't known. --- dlls/crypt32/chain.c | 6 +++++- dlls/crypt32/tests/chain.c | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d320111..0f2b5dd 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2426,7 +2426,11 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, case CRYPT_E_NO_REVOCATION_CHECK: case CRYPT_E_NO_REVOCATION_DLL: case CRYPT_E_NOT_IN_REVOCATION_DATABASE: - error = CERT_TRUST_REVOCATION_STATUS_UNKNOWN; + /* If the revocation status is unknown, it's assumed to be + * offline too. + */ + error = CERT_TRUST_REVOCATION_STATUS_UNKNOWN | + CERT_TRUST_IS_OFFLINE_REVOCATION; break; case CRYPT_E_REVOCATION_OFFLINE: error = CERT_TRUST_IS_OFFLINE_REVOCATION; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index f192d94..2b8d967 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3688,7 +3688,6 @@ static void testGetCertChain(void) /* The cert is rather old, so its revocation list can't be retrieved, * and its revocation status should be both offline and unknown. */ - todo_wine ok((chain->TrustStatus.dwErrorStatus & revocationFlags) == (CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_OFFLINE_REVOCATION), @@ -3709,7 +3708,6 @@ static void testGetCertChain(void) if (ret) { /* Even with a CRL in the store, the revocation status doesn't change */ - todo_wine ok((chain->TrustStatus.dwErrorStatus & revocationFlags) == (CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_OFFLINE_REVOCATION), @@ -3744,7 +3742,6 @@ static void testGetCertChain(void) /* The cert doesn't have a way to retrieve its CRL, so its revocation * status should be both offline and unknown. */ - todo_wine ok((chain->TrustStatus.dwErrorStatus & revocationFlags) == (CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_OFFLINE_REVOCATION), @@ -3765,7 +3762,6 @@ static void testGetCertChain(void) if (ret) { /* Even with a CRL in the store, the revocation status doesn't change */ - todo_wine ok((chain->TrustStatus.dwErrorStatus & revocationFlags) == (CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_OFFLINE_REVOCATION), @@ -3795,7 +3791,6 @@ static void testGetCertChain(void) if (ret) { /* Even with a CRL in the store, the revocation status doesn't change */ - todo_wine ok((chain->TrustStatus.dwErrorStatus & revocationFlags) == (CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_OFFLINE_REVOCATION), @@ -3824,7 +3819,6 @@ static void testGetCertChain(void) if (ret) { /* Even with a CRL in the store, the revocation status doesn't change */ - todo_wine ok((chain->TrustStatus.dwErrorStatus & revocationFlags) == (CERT_TRUST_REVOCATION_STATUS_UNKNOWN | CERT_TRUST_IS_OFFLINE_REVOCATION),

1 0

Juan Lang : crypt32: Fix tests on older Windows versions.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: bcbfddd82ac0efb278d2ea0590f697a3561bebcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbfddd82ac0efb278d2ea059… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 10:46:29 2009 -0800 crypt32: Fix tests on older Windows versions. --- dlls/crypt32/tests/crl.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index b012db1..bd70d32 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -466,7 +466,7 @@ static void testFindCRL(void) /* Try various find flags */ context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_SIGNATURE_FLAG, CRL_FIND_ISSUED_BY, cert, NULL); - ok(!context, "unexpected context\n"); + ok(!context || broken(context != NULL /* Win9x */), "unexpected context\n"); /* The CRL doesn't have an AKI extension, so it matches any cert */ context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG, CRL_FIND_ISSUED_BY, cert, NULL); @@ -487,7 +487,8 @@ static void testFindCRL(void) issuedForPara.pIssuerCert = cert; context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR, &issuedForPara, NULL); - ok(context != NULL, "Expected a context\n"); + ok(context != NULL || broken(!context /* Win9x, NT4 */), + "Expected a context\n"); if (context) { ok(context->cbCrlEncoded == sizeof(signedCRL), @@ -529,12 +530,13 @@ static void testFindCRL(void) * match cert's issuer, but verisignCRL does not, so the expected count * is 0. */ - ok(count == 3, "expected 3 matching CRLs, got %d\n", count); + ok(count == 3 || broken(count == 0 /* NT4, Win9x */), + "expected 3 matching CRLs, got %d\n", count); /* Only v1CRLWithIssuerAndEntry and v2CRLWithIssuingDistPoint contain * entries, so the count of CRL entries that match cert is 2. */ - ok(revoked_count == 2, "expected 2 matching CRL entries, got %d\n", - revoked_count); + ok(revoked_count == 2 || broken(revoked_count == 0 /* NT4, Win9x */), + "expected 2 matching CRL entries, got %d\n", revoked_count); CertFreeCertificateContext(cert); @@ -589,7 +591,8 @@ static void testFindCRL(void) revoked_count++; } } while (context); - ok(count == 1, "expected 1 matching CRLs, got %d\n", count); + ok(count == 1 || broken(count == 0 /* Win9x, NT4 */), + "expected 1 matching CRLs, got %d\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n", revoked_count); CertFreeCertificateContext(cert); @@ -628,9 +631,10 @@ static void testFindCRL(void) revoked_count++; } } while (context); - ok(count == 1, "expected 1 matching CRLs, got %d\n", count); - ok(revoked_count == 1, "expected 1 matching CRL entries, got %d\n", - revoked_count); + ok(count == 1 || broken(count == 0 /* Win9x, NT4 */), + "expected 1 matching CRLs, got %d\n", count); + ok(revoked_count == 1 || broken(revoked_count == 0 /* Win9x, NT4 */), + "expected 1 matching CRL entries, got %d\n", revoked_count); /* Test CRL_FIND_ISSUED_BY flags */ count = revoked_count = 0; @@ -701,7 +705,8 @@ static void testFindCRL(void) } } while (context); todo_wine - ok(count == 0, "expected 0 matching CRLs, got %d\n", count); + ok(count == 0 || broken(count == 1 /* Win9x */), + "expected 1 matching CRLs, got %d\n", count); ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n", revoked_count); count = revoked_count = 0;

1 0

Maarten Lankhorst : include: Fix a dsound define.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

Module: wine Branch: master Commit: cd143fb5bf1c4f68b805c06ca33272132f20d653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd143fb5bf1c4f68b805c06ca… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 19 13:06:08 2009 +0100 include: Fix a dsound define. --- include/dsound.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dsound.h b/include/dsound.h index e1bd668..0923561 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1074,7 +1074,7 @@ DECLARE_INTERFACE_(IDirectSound3DBuffer,IUnknown) #define IDirectSound3DBuffer_GetPosition(p,a) (p)->lpVtbl->GetPosition(p,a) #define IDirectSound3DBuffer_GetVelocity(p,a) (p)->lpVtbl->GetVelocity(p,a) #define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->lpVtbl->SetAllParameters(p,a,b) -#define IDirectSound3DBuffer_SetConeAngles(p,a,b) (p)->lpVtbl->SetConeAngles(p,a,b) +#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->lpVtbl->SetConeAngles(p,a,b,c) #define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->lpVtbl->SetConeOrientation(p,a,b,c,d) #define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->lpVtbl->SetConeOutsideVolume(p,a,b) #define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->lpVtbl->SetMaxDistance(p,a,b)

1 0

Juan Lang : cryptnet: Fix memory leaks in tests.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

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: Check number of contexts in CertDllVerifyRevocation.
by Alexandre Julliard Nov. 20, 2009

Nov. 20, 2009

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 Nov. 20, 2009

Nov. 20, 2009

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