November 2009 - Wine-commits

Juan Lang : crypt32: Correct CertIsValidCRLForCertificate for certificates that do not contain a CRL dist points extension .
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: f378394acda10cb7b9daa9889cf4774940c944ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f378394acda10cb7b9daa9889… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 19 11:48:53 2009 -0800 crypt32: Correct CertIsValidCRLForCertificate for certificates that do not contain a CRL dist points extension. --- dlls/crypt32/crl.c | 12 ++++-------- dlls/crypt32/tests/crl.c | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 03f9b78..5b93d3a 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -649,15 +649,11 @@ BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, } else { - /* no CRL dist points extension in cert, compare CRL's issuer - * to cert's issuer. + /* no CRL dist points extension in cert, can't match the CRL + * (which has an issuing dist point extension) */ - if (!CertCompareCertificateName(pCrl->dwCertEncodingType, - &pCrl->pCrlInfo->Issuer, &pCert->pCertInfo->Issuer)) - { - ret = FALSE; - SetLastError(CRYPT_E_NO_MATCH); - } + ret = FALSE; + SetLastError(CRYPT_E_NO_MATCH); } LocalFree(idp); } diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index bd70d32..dfb9356 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -530,6 +530,7 @@ 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 @@ -537,6 +538,7 @@ 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); @@ -1000,11 +1002,9 @@ static void testIsValidCRLForCert(void) sizeof(v2CRLWithIssuingDistPoint)); ok(crl != NULL, "CertCreateCRLContext failed: %08x\n", GetLastError()); - todo_wine { ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); - } ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError());

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 20 Nov '09

20 Nov '09

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 20 Nov '09

20 Nov '09

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: Invalidate open storage objects that outlive their parent.
by Alexandre Julliard 20 Nov '09

20 Nov '09

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

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

20 Nov '09

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

Vincent Povirk : ole32: Forbid renaming an open storage.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 8569d547b986c84a924836bb84a9ecfd14a65fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8569d547b986c84a924836bb8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 19 13:57:43 2009 -0600 ole32: Forbid renaming an open storage. --- dlls/ole32/storage32.c | 5 +++-- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 773855f..4e667c6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -765,9 +765,10 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( if (currentEntryRef != DIRENTRY_NULL) { - if (StorageBaseImpl_IsStreamOpen(This, currentEntryRef)) + if (StorageBaseImpl_IsStreamOpen(This, currentEntryRef) || + StorageBaseImpl_IsStorageOpen(This, currentEntryRef)) { - WARN("Stream is already open; cannot rename.\n"); + WARN("Element is already open; cannot rename.\n"); return STG_E_ACCESSDENIED; } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 42741ac..05d1473 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1073,7 +1073,7 @@ static void test_substorage_share(void) /* cannot rename the storage while it's open */ r = IStorage_RenameElement(stg, stgname, othername); - todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); + ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stgname); #if 0

1 0

Maarten Lankhorst : include: Fix a dsound define.
by Alexandre Julliard 20 Nov '09

20 Nov '09

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

Piotr Caban : msxml3: Implemented more data types handling xmlnode_get_nodeTypedValue.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 2a9eb6e3bb452333c7a5750478bb8a88f8d1232c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9eb6e3bb452333c7a575047… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Nov 19 20:50:22 2009 +0100 msxml3: Implemented more data types handling xmlnode_get_nodeTypedValue. --- dlls/msxml3/node.c | 16 +++++- dlls/msxml3/tests/domdoc.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1ddbc07..485a108 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -949,7 +949,7 @@ static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) { if(!type || !lstrcmpiW(type, szString) || - !lstrcmpiW(type, szNumber)) + !lstrcmpiW(type, szNumber) || !lstrcmpiW(type, szUUID)) { V_VT(v) = VT_BSTR; V_BSTR(v) = bstr_from_xmlChar(str); @@ -1020,7 +1020,7 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) VARIANT src; HRESULT hres; - if(!lstrcmpiW(type, szInt)) + if(!lstrcmpiW(type, szInt) || !lstrcmpiW(type, szI4)) V_VT(v) = VT_I4; else if(!lstrcmpiW(type, szFixed)) V_VT(v) = VT_CY; @@ -1028,6 +1028,18 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) V_VT(v) = VT_BOOL; else if(!lstrcmpiW(type, szI1)) V_VT(v) = VT_I1; + else if(!lstrcmpiW(type, szI2)) + V_VT(v) = VT_I2; + else if(!lstrcmpiW(type, szIU1)) + V_VT(v) = VT_UI1; + else if(!lstrcmpiW(type, szIU2)) + V_VT(v) = VT_UI2; + else if(!lstrcmpiW(type, szIU4)) + V_VT(v) = VT_UI4; + else if(!lstrcmpiW(type, szR4)) + V_VT(v) = VT_R4; + else if(!lstrcmpiW(type, szR8) || !lstrcmpiW(type, szFloat)) + V_VT(v) = VT_R8; else { FIXME("Type handling not yet implemented\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 20c6a9f..3f02ff5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -162,6 +162,15 @@ static const CHAR szTypeValueXML[] = " <time dt:dt=\"time\">13:57:12.31321</time>\n" " <timetz dt:dt=\"time.tz\">23:21:01.13+03:21</timetz>\n" " <i1 dt:dt=\"i1\">-13</i1>\n" +" <i2 dt:dt=\"i2\">31915</i2>\n" +" <i4 dt:dt=\"i4\">-312232</i4>\n" +" <ui1 dt:dt=\"ui1\">123</ui1>\n" +" <ui2 dt:dt=\"ui2\">48282</ui2>\n" +" <ui4 dt:dt=\"ui4\">949281</ui4>\n" +" <r4 dt:dt=\"r4\">213124.0</r4>\n" +" <r8 dt:dt=\"r8\">0.412</r8>\n" +" <float dt:dt=\"float\">41221.421</float>\n" +" <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4164,6 +4173,123 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i2"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_I2, "incorrect type\n"); + ok(V_I2(&v) == 31915, "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i4"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_I4, "incorrect type\n"); + ok(V_I4(&v) == -312232, "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui1"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_UI1, "incorrect type\n"); + ok(V_UI1(&v) == 123, "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui2"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_UI2, "incorrect type\n"); + ok(V_UI2(&v) == 48282, "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui4"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_UI4, "incorrect type\n"); + ok(V_UI4(&v) == 949281, "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/r4"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_R4, "incorrect type\n"); + double_eq(213124.0, V_R4(&v)); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/r8"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_R8, "incorrect type\n"); + double_eq(0.412, V_R8(&v)); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/float"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_R8, "incorrect type\n"); + double_eq(41221.421, V_R8(&v)); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/uuid"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_BSTR, "incorrect type\n"); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("333C7BC4-460F-11D0-BC04-0080C7055a83")), "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'bin.hex' data type handling.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 3c58b1c418bdf4f8c5f4266860c7f26fe717b228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c58b1c418bdf4f8c5f426686… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Nov 19 20:50:33 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'bin.hex' data type handling. --- dlls/msxml3/node.c | 26 ++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 485a108..47f5401 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -946,6 +946,13 @@ static HRESULT WINAPI xmlnode_get_definition( static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); +inline BYTE hex_to_byte(xmlChar c) +{ + if(c <= '9') return c-'0'; + if(c <= 'F') return c-'A'+10; + return c-'a'+10; +} + inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) { if(!type || !lstrcmpiW(type, szString) || @@ -1015,6 +1022,25 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) VariantClear(&src); } + else if(!lstrcmpiW(type, szBinHex)) + { + SAFEARRAYBOUND sab; + int i, len; + + len = xmlStrlen(str)/2; + sab.lLbound = 0; + sab.cElements = len; + + V_VT(v) = (VT_ARRAY|VT_UI1); + V_ARRAY(v) = SafeArrayCreate(VT_UI1, 1, &sab); + + if(!V_ARRAY(v)) + return E_OUTOFMEMORY; + + for(i=0; i<len; i++) + ((BYTE*)V_ARRAY(v)->pvData)[i] = (hex_to_byte(str[2*i])<<4) + + hex_to_byte(str[2*i+1]); + } else { VARIANT src; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3f02ff5..d220356 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -171,6 +171,7 @@ static const CHAR szTypeValueXML[] = " <r8 dt:dt=\"r8\">0.412</r8>\n" " <float dt:dt=\"float\">41221.421</float>\n" " <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n" +" <binhex dt:dt=\"bin.hex\">fffca012003c</binhex>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4290,6 +4291,23 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/binhex"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + BYTE bytes[] = {0xff,0xfc,0xa0,0x12,0x00,0x3c}; + + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == (VT_ARRAY|VT_UI1), "incorrect type\n"); + ok(V_ARRAY(&v)->rgsabound[0].cElements == 6, "incorrect array size\n"); + if(V_ARRAY(&v)->rgsabound[0].cElements == 6) + ok(!memcmp(bytes, V_ARRAY(&v)->pvData, sizeof(bytes)), "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'bin.base64' data type handling.
by Alexandre Julliard 20 Nov '09

20 Nov '09

Module: wine Branch: master Commit: 8700253775d52ec1e6cb32217756e17f12aad717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8700253775d52ec1e6cb32217… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Nov 19 20:50:41 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'bin.base64' data type handling. --- dlls/msxml3/node.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 47f5401..eadd4e9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -953,6 +953,15 @@ inline BYTE hex_to_byte(xmlChar c) return c-'a'+10; } +inline BYTE base64_to_byte(xmlChar c) +{ + if(c == '+') return 62; + if(c == '/') return 63; + if(c <= '9') return c-'0'+52; + if(c <= 'Z') return c-'A'; + return c-'a'+26; +} + inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) { if(!type || !lstrcmpiW(type, szString) || @@ -1041,6 +1050,37 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) ((BYTE*)V_ARRAY(v)->pvData)[i] = (hex_to_byte(str[2*i])<<4) + hex_to_byte(str[2*i+1]); } + else if(!lstrcmpiW(type, szBinBase64)) + { + SAFEARRAYBOUND sab; + int i, len; + + len = xmlStrlen(str); + if(str[len-2] == '=') i = 2; + else if(str[len-1] == '=') i = 1; + else i = 0; + + sab.lLbound = 0; + sab.cElements = len/4*3-i; + + V_VT(v) = (VT_ARRAY|VT_UI1); + V_ARRAY(v) = SafeArrayCreate(VT_UI1, 1, &sab); + + if(!V_ARRAY(v)) + return E_OUTOFMEMORY; + + for(i=0; i<len/4; i++) + { + ((BYTE*)V_ARRAY(v)->pvData)[3*i] = (base64_to_byte(str[4*i])<<2) + + (base64_to_byte(str[4*i+1])>>4); + if(3*i+1 < sab.cElements) + ((BYTE*)V_ARRAY(v)->pvData)[3*i+1] = (base64_to_byte(str[4*i+1])<<4) + + (base64_to_byte(str[4*i+2])>>2); + if(3*i+2 < sab.cElements) + ((BYTE*)V_ARRAY(v)->pvData)[3*i+2] = (base64_to_byte(str[4*i+2])<<6) + + base64_to_byte(str[4*i+3]); + } + } else { VARIANT src; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d220356..d72452d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -172,6 +172,7 @@ static const CHAR szTypeValueXML[] = " <float dt:dt=\"float\">41221.421</float>\n" " <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n" " <binhex dt:dt=\"bin.hex\">fffca012003c</binhex>\n" +" <binbase64 dt:dt=\"bin.base64\">YmFzZTY0IHRlc3Q=</binbase64>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4308,6 +4309,23 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/binbase64"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + BYTE bytes[] = {0x62,0x61,0x73,0x65,0x36,0x34,0x20,0x74,0x65,0x73,0x74}; + + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == (VT_ARRAY|VT_UI1), "incorrect type\n"); + ok(V_ARRAY(&v)->rgsabound[0].cElements == 11, "incorrect array size\n"); + if(V_ARRAY(&v)->rgsabound[0].cElements == 11) + ok(!memcmp(bytes, V_ARRAY(&v)->pvData, sizeof(bytes)), "incorrect value\n"); + VariantClear(&v); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0