wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

James Hawkins : msi: Close the original record before copying new data into it.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 9ab7d9e21a0e6af8159902835f17b2d82a9d0380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab7d9e21a0e6af8159902835… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:12 2009 -0800 msi: Close the original record before copying new data into it. --- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 2 +- dlls/msi/table.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5b23f55..0e1a23b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -698,6 +698,7 @@ extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ); /* record internals */ +extern void MSI_CloseRecord( MSIOBJECTHDR * ); extern UINT MSI_RecordSetIStream( MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **); extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 68eab69..45adbac 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -64,7 +64,7 @@ static void MSI_FreeField( MSIFIELD *field ) } } -static void MSI_CloseRecord( MSIOBJECTHDR *arg ) +void MSI_CloseRecord( MSIOBJECTHDR *arg ) { MSIRECORD *rec = (MSIRECORD *) arg; UINT i; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d2b9a00..7c341a7 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1835,6 +1835,9 @@ static UINT msi_refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT ro if (r != ERROR_SUCCESS) return r; + /* Close the original record */ + MSI_CloseRecord(&rec->hdr); + count = MSI_RecordGetFieldCount(rec); for (i = 0; i < count; i++) MSI_RecordCopyField(curr, i + 1, rec, i + 1);

1 0

James Hawkins : msi: Fix a handle leak in the record tests.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: a44b653d53806a62cd8b80a59174e3923113ae6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44b653d53806a62cd8b80a59… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:06 2009 -0800 msi: Fix a handle leak in the record tests. --- dlls/msi/tests/record.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index e8dd6f5..0da69c7 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -604,6 +604,7 @@ static void test_fieldzero(void) r = MsiRecordIsNull(rec, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r); + MsiCloseHandle(rec); MsiCloseHandle(hdb); DeleteFileA(msifile); }

1 0

Marcus Meissner : dmloader: pObject NULL checks are not necessary (Coverity ).
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 6891b963645b01909bdcec9830cf5f43004fffe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6891b963645b01909bdcec983… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 11 00:10:02 2009 +0100 dmloader: pObject NULL checks are not necessary (Coverity). --- dlls/dmloader/loader.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 17a8eb2..393b6b9 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -333,18 +333,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR if (!pObjectEntry) { pObjectEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY)); DM_STRUCT_INIT(&pObjectEntry->Desc); - if (pObject) { - DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); - pObjectEntry->pObject = pObject; - pObjectEntry->bInvalidDefaultDLS = FALSE; - } + DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); + pObjectEntry->pObject = pObject; + pObjectEntry->bInvalidDefaultDLS = FALSE; list_add_head (This->pObjects, &pObjectEntry->entry); } else { - if (pObject) { - DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); - pObjectEntry->pObject = pObject; - pObjectEntry->bInvalidDefaultDLS = FALSE; - } + DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); + pObjectEntry->pObject = pObject; + pObjectEntry->bInvalidDefaultDLS = FALSE; } TRACE(": filled in cache entry\n"); } else TRACE(": caching disabled\n");

1 0

Marcus Meissner : dmime: Actually get a pCLSID stream before using it ( Coverity).
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 981589884094884173dad9bd35641db68d31fdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=981589884094884173dad9bd3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 11 00:04:40 2009 +0100 dmime: Actually get a pCLSID stream before using it (Coverity). --- dlls/dmime/segment.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 64cb10a..ca127d7 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -359,6 +359,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicSegment8_GetParam (LP LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); + hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); + if (FAILED(hr)) { + ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack); + continue ; + } + TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ;

1 0

Marcus Meissner : jscript: Fixed uninitialized usage of i (Coverity).
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: aaff57da2276083086ea5d84e09ea6e4370db2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaff57da2276083086ea5d84e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 10 23:56:21 2009 +0100 jscript: Fixed uninitialized usage of i (Coverity). --- dlls/jscript/function.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 7819bc4..4f4a87f 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -669,7 +669,7 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t parser_ctx_t *parser; DispatchEx *function; BSTR *params = NULL; - int i, j=0; + int i=0, j=0; HRESULT hres = S_OK; static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('};

1 0

Vincent Povirk : ole32: Implement Revert for transacted storage objects.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 3ff33e9303df1696c1d87c21a95fe06159dc9c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff33e9303df1696c1d87c21a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 18:02:59 2009 -0600 ole32: Implement Revert for transacted storage objects. --- dlls/ole32/storage32.c | 18 +++++++++++++++++- dlls/ole32/tests/storage32.c | 12 +++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bd755e9..479c2a5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4044,7 +4044,23 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( static HRESULT WINAPI TransactedSnapshotImpl_Revert( IStorage* iface) { - FIXME("(%p): stub\n", iface); + TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) iface; + StorageBaseImpl *newSnapshot; + HRESULT hr; + + TRACE("(%p)\n", iface); + + /* Create a new copy of the parent data. */ + hr = CreateSnapshotFile(This->transactedParent, &newSnapshot); + if (FAILED(hr)) return hr; + + /* Destroy the open objects. */ + StorageBaseImpl_DeleteAll(&This->base); + + /* Replace our current snapshot. */ + IStorage_Release((IStorage*)This->snapshot); + This->snapshot = newSnapshot; + return S_OK; } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 0494369..f89a787 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1195,7 +1195,6 @@ static void test_revert(void) r = IStorage_Revert(stg); /* all open objects become invalid */ - todo_wine { r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); @@ -1207,7 +1206,6 @@ static void test_revert(void) r = IStorage_Stat(stg3, &statstg, STATFLAG_NONAME); ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); - } IStream_Release(stm); IStream_Release(stm2); @@ -1226,17 +1224,13 @@ static void test_revert(void) r = IStorage_OpenStorage(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); - todo_wine { r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); - } if (r == S_OK) IStream_Release(stm); - todo_wine { r = IStorage_OpenStorage(stg, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); - } if (r == S_OK) IStorage_Release(stg2); @@ -1258,7 +1252,7 @@ static void test_revert(void) IStorage_Release(stg3); r = IStorage_OpenStorage(stg2, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg3 ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); if (r == S_OK) IStorage_Release(stg3); @@ -1398,7 +1392,7 @@ static void test_nonroot_transacted(void) IStream_Release(stm); r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm); @@ -1460,7 +1454,7 @@ static void test_nonroot_transacted(void) IStream_Release(stm); r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm);

1 0

Vincent Povirk : ole32: Implement transacted storage.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 226363f5dfb9caa8313e425c7f85ed9fe581f1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=226363f5dfb9caa8313e425c7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 17:33:50 2009 -0600 ole32: Implement transacted storage. --- dlls/ole32/storage32.c | 214 +++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/storage32.c | 8 +- 2 files changed, 201 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=226363f5dfb9caa8313e4…

1 0

Vincent Povirk : ole32: Add a stub transacted storage type.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: d799f7e18962669c445aebdf06dac3befa888e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d799f7e18962669c445aebdf0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 10:59:47 2009 -0600 ole32: Add a stub transacted storage type. TransactedSnapshotImpl acts as a proxy between the user and the storage interfaces that modify the file directly (or another transacted storage). Currently, it does not change the operations. --- dlls/ole32/storage32.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ole32/storage32.h | 5 + 2 files changed, 271 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d799f7e18962669c445ae…

1 0

Vincent Povirk : ole32: Add Invalidate to the storage vtable.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 42142200d531e1563d73539e14fde6df9c72bf67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42142200d531e1563d73539e1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 15:49:31 2009 -0600 ole32: Add Invalidate to the storage vtable. --- dlls/ole32/storage32.c | 25 +++++++++++++++++++------ dlls/ole32/storage32.h | 6 ++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f9f8e87..e16b9f8 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -91,6 +91,7 @@ typedef struct StorageInternalImpl StorageInternalImpl; static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* parentStorage, DWORD openFlags, DirRef storageDirEntry); static void StorageImpl_Destroy(StorageBaseImpl* iface); +static void StorageImpl_Invalidate(StorageBaseImpl* iface); static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer); static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer); static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock); @@ -116,7 +117,6 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( StorageImpl* This, 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 */ /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */ @@ -1884,7 +1884,7 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) LIST_FOR_EACH_SAFE(cur, cur2, &stg->storageHead) { childstg = LIST_ENTRY(cur,StorageInternalImpl,ParentListEntry); - StorageInternalImpl_Invalidate( childstg ); + StorageBaseImpl_Invalidate( &childstg->base ); } } @@ -1913,7 +1913,7 @@ static HRESULT deleteStorageContents( { if (stg->base.storageDirEntry == indexToDelete) { - StorageInternalImpl_Invalidate(stg); + StorageBaseImpl_Invalidate(&stg->base); } } @@ -2413,6 +2413,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = static const StorageBaseImplVtbl StorageImpl_BaseVtbl = { StorageImpl_Destroy, + StorageImpl_Invalidate, StorageImpl_CreateDirEntry, StorageImpl_BaseWriteDirEntry, StorageImpl_BaseReadDirEntry, @@ -2652,12 +2653,21 @@ end: return hr; } +static void StorageImpl_Invalidate(StorageBaseImpl* iface) +{ + StorageImpl *This = (StorageImpl*) iface; + + StorageBaseImpl_DeleteAll(&This->base); + + This->base.reverted = 1; +} + static void StorageImpl_Destroy(StorageBaseImpl* iface) { StorageImpl *This = (StorageImpl*) iface; TRACE("(%p)\n", This); - StorageBaseImpl_DeleteAll(&This->base); + StorageImpl_Invalidate(iface); HeapFree(GetProcessHeap(), 0, This->pwcsName); @@ -3812,8 +3822,10 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( return SmallBlockChainStream_Construct(This, NULL, streamEntryRef); } -static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ) +static void StorageInternalImpl_Invalidate( StorageBaseImpl *base ) { + StorageInternalImpl* This = (StorageInternalImpl*) base; + if (!This->base.reverted) { TRACE("Storage invalidated (stg=%p)\n", This); @@ -3832,7 +3844,7 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; - StorageInternalImpl_Invalidate(This); + StorageInternalImpl_Invalidate(&This->base); HeapFree(GetProcessHeap(), 0, This); } @@ -4343,6 +4355,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = { StorageInternalImpl_Destroy, + StorageInternalImpl_Invalidate, StorageInternalImpl_CreateDirEntry, StorageInternalImpl_WriteDirEntry, StorageInternalImpl_ReadDirEntry, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index c68c6ea..dcd460c 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -248,6 +248,7 @@ struct StorageBaseImpl /* virtual methods for StorageBaseImpl objects */ struct StorageBaseImplVtbl { void (*Destroy)(StorageBaseImpl*); + void (*Invalidate)(StorageBaseImpl*); HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*); HRESULT (*ReadDirEntry)(StorageBaseImpl*,DirRef,DirEntry*); @@ -262,6 +263,11 @@ static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) This->baseVtbl->Destroy(This); } +static inline void StorageBaseImpl_Invalidate(StorageBaseImpl *This) +{ + This->baseVtbl->Invalidate(This); +} + static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This, const DirEntry *newData, DirRef *index) {

1 0

Vincent Povirk : ole32: Create internal storage objects with a refcount of 1.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 75fe621192c07de5e54fee3e566c3f798e9f1d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fe621192c07de5e54fee3e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 11:03:36 2009 -0600 ole32: Create internal storage objects with a refcount of 1. For consistency with StorageImpl_Construct. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index eaddcbf..f9f8e87 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -595,8 +595,6 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( { *ppstg = (IStorage*)newStorage; - StorageBaseImpl_AddRef(*ppstg); - list_add_tail(&This->storageHead, &newStorage->ParentListEntry); res = S_OK; @@ -4382,6 +4380,8 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.reverted = 0; + newStorage->base.ref = 1; + newStorage->parentStorage = parentStorage; /*

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009