December 2009 - Wine-commits

Vincent Povirk : windowscodecs: Accept GIF files with no trailer.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: f1405ca0d20b24aeb2d49b6a8565f0a876cce460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1405ca0d20b24aeb2d49b6a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 11:15:23 2009 -0600 windowscodecs: Accept GIF files with no trailer. --- dlls/windowscodecs/tests/bmpformat.c | 66 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/ungif.c | 5 ++- 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 1f114a2..cf5a6f8 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1034,6 +1034,71 @@ static void test_createfromstream(void) IWICImagingFactory_Release(factory); } +/* 1x1 pixel gif, missing trailer */ +static unsigned char gifimage_notrailer[] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, +0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, +0x01,0x00 +}; + +static void test_gif_notrailer(void) +{ + IWICBitmapDecoder *decoder; + IWICImagingFactory *factory; + HRESULT hr; + IWICStream *gifstream; + IWICBitmapFrameDecode *framedecode; + UINT framecount; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreateStream(factory, &gifstream); + ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromMemory(gifstream, gifimage_notrailer, + sizeof(gifimage_notrailer)); + ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = CoCreateInstance(&CLSID_WICGifDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)gifstream, + WICDecodeMetadataCacheOnDemand); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) IWICBitmapFrameDecode_Release(framedecode); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrameCount(decoder, &framecount); + ok(hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + ok(framecount == 1, "framecount=%u\n", framecount); + } + + IWICBitmapDecoder_Release(decoder); + } + + IWICStream_Release(gifstream); + } + + IWICImagingFactory_Release(factory); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1045,6 +1110,7 @@ START_TEST(bmpformat) test_decode_rle4(); test_componentinfo(); test_createfromstream(); + test_gif_notrailer(); CoUninitialize(); } diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index c24f387..cfc7613 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -320,7 +320,10 @@ DGifGetRecordType(GifFileType * GifFile, GifByteType Buf; if (READ(GifFile, &Buf, 1) != 1) { - return GIF_ERROR; + /* Wine-specific behavior: Native accepts broken GIF files that have no + * terminator, so we match this by treating EOF as a terminator. */ + *Type = TERMINATE_RECORD_TYPE; + return GIF_OK; } switch (Buf) {

1 0

Vincent Povirk : ole32: Make CreateDirEntry a virtual method.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 382ffed00388225a57db8c7313a149a547ffa587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382ffed00388225a57db8c731… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 25 15:28:34 2009 -0600 ole32: Make CreateDirEntry a virtual method. --- dlls/ole32/storage32.c | 28 ++++++++++++++++------------ dlls/ole32/storage32.h | 7 +++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 384722d..1df4d9f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -184,11 +184,6 @@ static HRESULT removeFromTree( * Declaration of the functions used to manipulate DirEntry */ -static HRESULT createDirEntry( - StorageImpl *storage, - const DirEntry *newData, - DirRef *index); - static HRESULT destroyDirEntry( StorageImpl *storage, DirRef index); @@ -926,8 +921,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( /* * Create an entry with the new data */ - createDirEntry(This->ancestorStorage, &newStreamEntry, &newStreamEntryRef); - + StorageBaseImpl_CreateDirEntry(This, &newStreamEntry, &newStreamEntryRef); /* * Insert the new entry in the parent storage's tree. */ @@ -1117,7 +1111,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( /* * Create a new directory entry for the storage */ - createDirEntry(This->ancestorStorage, &newEntry, &newEntryRef); + StorageBaseImpl_CreateDirEntry(This, &newEntry, &newEntryRef); /* * Insert the new directory entry into the parent storage's tree @@ -1148,11 +1142,12 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( * * Reserve a directory entry in the file and initialize it. */ -static HRESULT createDirEntry( - StorageImpl *storage, +static HRESULT StorageImpl_CreateDirEntry( + StorageBaseImpl *base, const DirEntry *newData, DirRef *index) { + StorageImpl *storage = (StorageImpl*)base; ULONG currentEntryIndex = 0; ULONG newEntryIndex = DIRENTRY_NULL; HRESULT hr = S_OK; @@ -2221,7 +2216,8 @@ static const IStorageVtbl Storage32Impl_Vtbl = static const StorageBaseImplVtbl StorageImpl_BaseVtbl = { - StorageImpl_Destroy + StorageImpl_Destroy, + StorageImpl_CreateDirEntry }; static HRESULT StorageImpl_Construct( @@ -3639,6 +3635,13 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) HeapFree(GetProcessHeap(), 0, This); } +static HRESULT StorageInternalImpl_CreateDirEntry(StorageBaseImpl *base, + const DirEntry *newData, DirRef *index) +{ + return StorageBaseImpl_CreateDirEntry(&base->ancestorStorage->base, + newData, index); +} + /****************************************************************************** ** ** Storage32InternalImpl_Commit @@ -4081,7 +4084,8 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = { - StorageInternalImpl_Destroy + StorageInternalImpl_Destroy, + StorageInternalImpl_CreateDirEntry }; /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index c97a2b7..cfdc6df 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*); + HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); }; static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) @@ -255,6 +256,12 @@ static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) This->baseVtbl->Destroy(This); } +static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This, + const DirEntry *newData, DirRef *index) +{ + return This->baseVtbl->CreateDirEntry(This, newData, index); +} + /**************************************************************************** * StorageBaseImpl stream list handlers */

1 0

Vincent Povirk : ole32: Change WriteDirEntry return type to HRESULT.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: df13a1d1fea128207ed25788a37e45929754a6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=df13a1d1fea128207ed25788a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 25 15:51:48 2009 -0600 ole32: Change WriteDirEntry return type to HRESULT. --- dlls/ole32/storage32.c | 30 ++++++++++++++---------------- dlls/ole32/storage32.h | 2 +- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1df4d9f..8173b84 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -978,11 +978,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( { currentEntry.clsid = *clsid; - success = StorageImpl_WriteDirEntry(This->ancestorStorage, - This->storageDirEntry, - &currentEntry); - if (success) - hRes = S_OK; + hRes = StorageImpl_WriteDirEntry(This->ancestorStorage, + This->storageDirEntry, + &currentEntry); } return hRes; @@ -2091,13 +2089,13 @@ static HRESULT removeFromTree( */ setEntryLink(&parentEntry, typeOfRelation, entryToDelete.leftChild); - res = StorageImpl_WriteDirEntry( + hr = StorageImpl_WriteDirEntry( This, parentEntryRef, &parentEntry); - if(!res) + if(FAILED(hr)) { - return E_FAIL; + return hr; } if (entryToDelete.rightChild != DIRENTRY_NULL) @@ -2127,13 +2125,13 @@ static HRESULT removeFromTree( newRightChildParentEntry.rightChild = entryToDelete.rightChild; - res = StorageImpl_WriteDirEntry( + hr = StorageImpl_WriteDirEntry( This, newRightChildParent, &newRightChildParentEntry); - if (!res) + if (FAILED(hr)) { - return E_FAIL; + return hr; } } } @@ -2144,13 +2142,13 @@ static HRESULT removeFromTree( */ setEntryLink(&parentEntry, typeOfRelation, entryToDelete.rightChild); - res = StorageImpl_WriteDirEntry( + hr = StorageImpl_WriteDirEntry( This, parentEntryRef, &parentEntry); - if(!res) + if(FAILED(hr)) { - return E_FAIL; + return hr; } } @@ -3334,7 +3332,7 @@ BOOL StorageImpl_ReadDirEntry( /********************************************************************* * Write the specified directory entry to the file */ -BOOL StorageImpl_WriteDirEntry( +HRESULT StorageImpl_WriteDirEntry( StorageImpl* This, DirRef index, const DirEntry* buffer) @@ -3345,7 +3343,7 @@ BOOL StorageImpl_WriteDirEntry( UpdateRawDirEntry(currentEntry, buffer); writeRes = StorageImpl_WriteRawDirEntry(This, index, currentEntry); - return SUCCEEDED(writeRes) ? TRUE : FALSE; + return writeRes; } static BOOL StorageImpl_ReadBigBlock( diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index cfdc6df..45fffac 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -336,7 +336,7 @@ BOOL StorageImpl_ReadDirEntry( DirRef index, DirEntry* buffer); -BOOL StorageImpl_WriteDirEntry( +HRESULT StorageImpl_WriteDirEntry( StorageImpl* This, DirRef index, const DirEntry* buffer);

1 0

Vincent Povirk : ole32: Change ReadDirEntry return type to HRESULT.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 8a332db2c514198b8e130154cb9148c34484d5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a332db2c514198b8e130154c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 25 16:20:55 2009 -0600 ole32: Change ReadDirEntry return type to HRESULT. --- dlls/ole32/stg_stream.c | 26 ++++++++-------- dlls/ole32/storage32.c | 72 +++++++++++++++++++++------------------------- dlls/ole32/storage32.h | 2 +- 3 files changed, 47 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a332db2c514198b8e130…

1 0

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

07 Dec '09

Module: wine Branch: master Commit: 176cdfc75eb019f36ec8a198a495ffb3725a2467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176cdfc75eb019f36ec8a198a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 25 16:53:05 2009 -0600 ole32: Add WriteDirEntry to the storage vtable. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 28 ++++++++++++++++++++++------ dlls/ole32/storage32.h | 7 +++++++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 94cd2ed..a36b497 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -659,7 +659,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( if (SUCCEEDED(hr)) { - StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage, + StorageBaseImpl_WriteDirEntry(This->parentStorage, This->dirEntry, &currentEntry); } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 68de806..ee0b605 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -775,7 +775,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( /* Change the name of the element */ strcpyW(currentEntry.name, pwcsNewName); - StorageImpl_WriteDirEntry(This->ancestorStorage, currentEntryRef, + StorageBaseImpl_WriteDirEntry(This, currentEntryRef, &currentEntry); /* Insert the element in a new position in the tree */ @@ -971,9 +971,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( { currentEntry.clsid = *clsid; - hRes = StorageImpl_WriteDirEntry(This->ancestorStorage, - This->storageDirEntry, - &currentEntry); + hRes = StorageBaseImpl_WriteDirEntry(This, + This->storageDirEntry, + &currentEntry); } return hRes; @@ -2182,6 +2182,13 @@ static HRESULT WINAPI StorageBaseImpl_SetStateBits( return S_OK; } +static HRESULT StorageImpl_BaseWriteDirEntry(StorageBaseImpl *base, + DirRef index, const DirEntry *data) +{ + StorageImpl *This = (StorageImpl*)base; + return StorageImpl_WriteDirEntry(This, index, data); +} + /* * Virtual function table for the IStorage32Impl class. */ @@ -2210,7 +2217,8 @@ static const IStorageVtbl Storage32Impl_Vtbl = static const StorageBaseImplVtbl StorageImpl_BaseVtbl = { StorageImpl_Destroy, - StorageImpl_CreateDirEntry + StorageImpl_CreateDirEntry, + StorageImpl_BaseWriteDirEntry }; static HRESULT StorageImpl_Construct( @@ -3634,6 +3642,13 @@ static HRESULT StorageInternalImpl_CreateDirEntry(StorageBaseImpl *base, newData, index); } +static HRESULT StorageInternalImpl_WriteDirEntry(StorageBaseImpl *base, + DirRef index, const DirEntry *data) +{ + return StorageBaseImpl_WriteDirEntry(&base->ancestorStorage->base, + index, data); +} + /****************************************************************************** ** ** Storage32InternalImpl_Commit @@ -4077,7 +4092,8 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = { StorageInternalImpl_Destroy, - StorageInternalImpl_CreateDirEntry + StorageInternalImpl_CreateDirEntry, + StorageInternalImpl_WriteDirEntry }; /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 5d6f651..6c2cb14 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -249,6 +249,7 @@ struct StorageBaseImpl struct StorageBaseImplVtbl { void (*Destroy)(StorageBaseImpl*); HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); + HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*); }; static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) @@ -262,6 +263,12 @@ static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This, return This->baseVtbl->CreateDirEntry(This, newData, index); } +static inline HRESULT StorageBaseImpl_WriteDirEntry(StorageBaseImpl *This, + DirRef index, const DirEntry *data) +{ + return This->baseVtbl->WriteDirEntry(This, index, data); +} + /**************************************************************************** * StorageBaseImpl stream list handlers */

1 0

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

07 Dec '09

Module: wine Branch: master Commit: f3d194b3912770ff865e21d6470ab58bab4f3770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d194b3912770ff865e21d64… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 25 17:01:27 2009 -0600 ole32: Add ReadDirEntry to the storage vtable. --- dlls/ole32/stg_stream.c | 8 ++++---- dlls/ole32/storage32.c | 30 +++++++++++++++++++++++------- dlls/ole32/storage32.h | 7 +++++++ 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index a36b497..6200126 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -208,7 +208,7 @@ static void StgStreamImpl_OpenBlockChain( /* * Read the information from the directory entry. */ - hr = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, + hr = StorageBaseImpl_ReadDirEntry(This->parentStorage, This->dirEntry, &currentEntry); @@ -605,7 +605,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( /* * Read this stream's size to see if it's small blocks or big blocks */ - StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, + StorageBaseImpl_ReadDirEntry(This->parentStorage, This->dirEntry, &currentEntry); /* @@ -650,7 +650,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( /* * Write the new information about this stream to the directory entry */ - hr = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, + hr = StorageBaseImpl_ReadDirEntry(This->parentStorage, This->dirEntry, &currentEntry); @@ -852,7 +852,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( /* * Read the information from the directory entry. */ - hr = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, + hr = StorageBaseImpl_ReadDirEntry(This->parentStorage, This->dirEntry, &currentEntry); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ee0b605..f54bfdf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -690,8 +690,8 @@ static HRESULT WINAPI StorageBaseImpl_Stat( goto end; } - res = StorageImpl_ReadDirEntry( - This->ancestorStorage, + res = StorageBaseImpl_ReadDirEntry( + This, This->storageDirEntry, &currentEntry); @@ -964,9 +964,9 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( if (!This->ancestorStorage) return STG_E_REVERTED; - hRes = StorageImpl_ReadDirEntry(This->ancestorStorage, - This->storageDirEntry, - &currentEntry); + hRes = StorageBaseImpl_ReadDirEntry(This, + This->storageDirEntry, + &currentEntry); if (SUCCEEDED(hRes)) { currentEntry.clsid = *clsid; @@ -2189,6 +2189,13 @@ static HRESULT StorageImpl_BaseWriteDirEntry(StorageBaseImpl *base, return StorageImpl_WriteDirEntry(This, index, data); } +static HRESULT StorageImpl_BaseReadDirEntry(StorageBaseImpl *base, + DirRef index, DirEntry *data) +{ + StorageImpl *This = (StorageImpl*)base; + return StorageImpl_ReadDirEntry(This, index, data); +} + /* * Virtual function table for the IStorage32Impl class. */ @@ -2218,7 +2225,8 @@ static const StorageBaseImplVtbl StorageImpl_BaseVtbl = { StorageImpl_Destroy, StorageImpl_CreateDirEntry, - StorageImpl_BaseWriteDirEntry + StorageImpl_BaseWriteDirEntry, + StorageImpl_BaseReadDirEntry, }; static HRESULT StorageImpl_Construct( @@ -3649,6 +3657,13 @@ static HRESULT StorageInternalImpl_WriteDirEntry(StorageBaseImpl *base, index, data); } +static HRESULT StorageInternalImpl_ReadDirEntry(StorageBaseImpl *base, + DirRef index, DirEntry *data) +{ + return StorageBaseImpl_ReadDirEntry(&base->ancestorStorage->base, + index, data); +} + /****************************************************************************** ** ** Storage32InternalImpl_Commit @@ -4093,7 +4108,8 @@ static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = { StorageInternalImpl_Destroy, StorageInternalImpl_CreateDirEntry, - StorageInternalImpl_WriteDirEntry + StorageInternalImpl_WriteDirEntry, + StorageInternalImpl_ReadDirEntry }; /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 6c2cb14..a087e0d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -250,6 +250,7 @@ struct StorageBaseImplVtbl { void (*Destroy)(StorageBaseImpl*); HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*); + HRESULT (*ReadDirEntry)(StorageBaseImpl*,DirRef,DirEntry*); }; static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) @@ -269,6 +270,12 @@ static inline HRESULT StorageBaseImpl_WriteDirEntry(StorageBaseImpl *This, return This->baseVtbl->WriteDirEntry(This, index, data); } +static inline HRESULT StorageBaseImpl_ReadDirEntry(StorageBaseImpl *This, + DirRef index, DirEntry *data) +{ + return This->baseVtbl->ReadDirEntry(This, index, data); +} + /**************************************************************************** * StorageBaseImpl stream list handlers */

1 0

James Hawkins : oleaut32: Add tests for DispGetParam. Fix two issues that crashed the tests.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 02dcc198545f764d8016c3440e6ea2fdc1fb33ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=02dcc198545f764d8016c3440… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 4 17:14:52 2009 -0800 oleaut32: Add tests for DispGetParam. Fix two issues that crashed the tests. --- dlls/oleaut32/dispatch.c | 7 + dlls/oleaut32/tests/Makefile.in | 1 + dlls/oleaut32/tests/dispatch.c | 287 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 295 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02dcc198545f764d8016c…

1 0

James Hawkins : oleaut32: Report the parameter index for any failure in DispGetParam.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 89b2cde891e6316cd1bef7c4c28396a575f4aced URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b2cde891e6316cd1bef7c4c… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 4 17:15:11 2009 -0800 oleaut32: Report the parameter index for any failure in DispGetParam. --- dlls/oleaut32/dispatch.c | 36 +++++++++++++++++++++++++----------- dlls/oleaut32/tests/dispatch.c | 27 ++++++--------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 5d96bfb..ed3fad4 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -131,16 +131,13 @@ HRESULT WINAPI DispGetParam( TRACE("position=%d, cArgs=%d, cNamedArgs=%d\n", position, pdispparams->cArgs, pdispparams->cNamedArgs); - if (pdispparams->cArgs > 0 && !pdispparams->rgvarg) - return E_INVALIDARG; - - if (!pvarResult) - return E_INVALIDARG; - - if (position < pdispparams->cArgs) { + if (position < pdispparams->cArgs) + { /* positional arg? */ pos = pdispparams->cArgs - position - 1; - } else { + } + else + { /* FIXME: is this how to handle named args? */ for (pos=0; pos<pdispparams->cNamedArgs; pos++) if (pdispparams->rgdispidNamedArgs[pos] == position) break; @@ -148,10 +145,27 @@ HRESULT WINAPI DispGetParam( if (pos==pdispparams->cNamedArgs) return DISP_E_PARAMNOTFOUND; } + + if (pdispparams->cArgs > 0 && !pdispparams->rgvarg) + { + hr = E_INVALIDARG; + goto done; + } + + if (!pvarResult) + { + hr = E_INVALIDARG; + goto done; + } + hr = VariantChangeType(pvarResult, &pdispparams->rgvarg[pos], 0, vtTarg); - if (hr == DISP_E_TYPEMISMATCH) *puArgErr = pos; + +done: + if (FAILED(hr)) + *puArgErr = pos; + return hr; } @@ -241,8 +255,8 @@ static HRESULT WINAPI StdDispatch_QueryInterface( IsEqualIID(riid, &IID_IUnknown)) { *ppvObject = This; - IUnknown_AddRef((LPUNKNOWN)*ppvObject); - return S_OK; + IUnknown_AddRef((LPUNKNOWN)*ppvObject); + return S_OK; } return E_NOINTERFACE; } diff --git a/dlls/oleaut32/tests/dispatch.c b/dlls/oleaut32/tests/dispatch.c index fb1e310..c81210f 100644 --- a/dlls/oleaut32/tests/dispatch.c +++ b/dlls/oleaut32/tests/dispatch.c @@ -103,11 +103,8 @@ void test_DispGetParam(void) INIT_DISPPARAMS(dispparams, NULL, NULL, 0, 0); err_index = 0xdeadbeef; hr = DispGetParam(&dispparams, 0, VT_I2, NULL, &err_index); - todo_wine - { - ok(hr == DISP_E_PARAMNOTFOUND, - "Expected DISP_E_PARAMNOTFOUND, got %08x\n", hr); - } + ok(hr == DISP_E_PARAMNOTFOUND, + "Expected DISP_E_PARAMNOTFOUND, got %08x\n", hr); ok(err_index == 0xdeadbeef, "Expected err_index to be unchanged, got %d\n", err_index); @@ -128,10 +125,7 @@ void test_DispGetParam(void) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); ok(V_VT(&result) == VT_EMPTY, "Expected VT_EMPTY, got %08x\n", V_VT(&result)); - todo_wine - { - ok(err_index == 0, "Expected 0, got %d\n", err_index); - } + ok(err_index == 0, "Expected 0, got %d\n", err_index); /* pdispparams.cNamedArgs is 1, yet pdispparams.rgdispidNamedArgs is NULL. * @@ -195,10 +189,7 @@ void test_DispGetParam(void) err_index = 0xdeadbeef; hr = DispGetParam(&dispparams, 2, VT_I2, NULL, &err_index); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - todo_wine - { - ok(err_index == 0, "Expected 0, got %d\n", err_index); - } + ok(err_index == 0, "Expected 0, got %d\n", err_index); /* puArgErr is NULL. */ INIT_DISPPARAMS(dispparams, vararg, NULL, 3, 0); @@ -239,10 +230,7 @@ void test_DispGetParam(void) ok(hr == DISP_E_OVERFLOW, "Expected DISP_E_OVERFLOW, got %08x\n", hr); ok(V_VT(&result) == VT_EMPTY, "Expected VT_EMPTY, got %08x\n", V_VT(&result)); - todo_wine - { - ok(err_index == 1, "Expected 1, got %d\n", err_index); - } + ok(err_index == 1, "Expected 1, got %d\n", err_index); /* Coerce the third (VT_BSTR) param to VT_I2. */ INIT_DISPPARAMS(dispparams, vararg, NULL, 3, 0); @@ -263,10 +251,7 @@ void test_DispGetParam(void) ok(hr == DISP_E_BADVARTYPE, "Expected DISP_E_BADVARTYPE, got %08x\n", hr); ok(V_VT(&result) == VT_EMPTY, "Expected VT_EMPTY, got %08x\n", V_VT(&result)); - todo_wine - { - ok(err_index == 0, "Expected 0, got %d\n", err_index); - } + ok(err_index == 0, "Expected 0, got %d\n", err_index); CLEAR_VARARG(vararg);

1 0

Rob Shearman : ole32: Initialise all of position variables in test_save_load_filemoniker.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4ad631286a01be1b4998d189b2ba0dd3973a632f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad631286a01be1b4998d189b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Dec 4 15:08:44 2009 +0000 ole32: Initialise all of position variables in test_save_load_filemoniker. Initialise all 8-bytes instead of just the lower 4-bytes. This test isn't designed to be testing whether the Seek method of the object return by CreateStreamOnHGlobal uses the high part of the positions passed in. --- dlls/ole32/tests/moniker.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d27f766..7cc5f78 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1878,9 +1878,9 @@ static void test_save_load_filemoniker(void) int i; /* see FileMonikerImpl_Save docs */ - zero_pos.u.LowPart = 0; - dead_pos.u.LowPart = sizeof(WORD) + sizeof(DWORD) + (lstrlenW(wszFileName1) + 1) + sizeof(WORD); - nulls_pos.u.LowPart = dead_pos.u.LowPart + sizeof(WORD); + zero_pos.QuadPart = 0; + dead_pos.QuadPart = sizeof(WORD) + sizeof(DWORD) + (lstrlenW(wszFileName1) + 1) + sizeof(WORD); + nulls_pos.QuadPart = dead_pos.QuadPart + sizeof(WORD); /* create the stream we're going to write to */ hr = CreateStreamOnHGlobal(NULL, TRUE, &pStm);

1 0

Rob Shearman : ole32: Add tests for HGLOBAL stream ignoring the HighPart of the offset for seeks .
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 2b74e774f94dd9dd66447aaf1de96915deb3981a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b74e774f94dd9dd66447aaf1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Dec 4 15:08:51 2009 +0000 ole32: Add tests for HGLOBAL stream ignoring the HighPart of the offset for seeks. --- dlls/ole32/tests/hglobalstream.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index cae13ed..4fee612 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -75,6 +75,23 @@ static void test_streamonhglobal(IStream *pStream) hr = IStream_SetSize(pStream, ull); ok_ole_success(hr, "IStream_SetSize"); + /* ignores HighPart */ + ll.u.HighPart = -1; + ll.u.LowPart = 0; + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); + todo_wine + ok_ole_success(hr, "IStream_Seek"); + ok(ull.u.LowPart == 0, "should have set LowPart to 0 instead of %d\n", ull.u.LowPart); + todo_wine + ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + + /* ignores HighPart */ + ll.u.HighPart = -1; + ll.u.LowPart = 0; + hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, NULL); + todo_wine + ok_ole_success(hr, "IStream_Seek"); + hr = IStream_Commit(pStream, STGC_DEFAULT); ok_ole_success(hr, "IStream_Commit");

1 0