December 2009 - Wine-Commits

Vincent Povirk : ole32: Add ReadDirEntry to the storage vtable.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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

Vincent Povirk : ole32: Add WriteDirEntry to the storage vtable.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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: Change WriteDirEntry return type to HRESULT.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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 : windowscodecs: Accept GIF files with no trailer.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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

Owen Rudge : imagehlp: Recalculate PE checksum after file modification.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: b49cc56614bd60ad2efd40d3c4dba570f33e6087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49cc56614bd60ad2efd40d3c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Dec 4 10:12:02 2009 -0600 imagehlp: Recalculate PE checksum after file modification. --- dlls/imagehlp/integrity.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index 3aaac7d..72bf155 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -285,6 +285,88 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num, return TRUE; } +/*********************************************************************** + * IMAGEHLP_RecalculateChecksum (INTERNAL) + * + * Update the NT header checksum for the specified file. + */ +static BOOL IMAGEHLP_RecalculateChecksum(HANDLE handle) +{ + DWORD FileLength, count, HeaderSum, pe_offset, nt_hdr_size; + IMAGE_NT_HEADERS32 nt_hdr32; + IMAGE_NT_HEADERS64 nt_hdr64; + LPVOID BaseAddress; + HANDLE hMapping; + DWORD *CheckSum; + void *nt_hdr; + int ret; + BOOL r; + + TRACE("handle %p\n", handle); + + ret = IMAGEHLP_GetNTHeaders(handle, &pe_offset, &nt_hdr32, &nt_hdr64); + + if (ret == HDR_NT32) + { + CheckSum = &nt_hdr32.OptionalHeader.CheckSum; + + nt_hdr = &nt_hdr32; + nt_hdr_size = sizeof(IMAGE_NT_HEADERS32); + } + else if (ret == HDR_NT64) + { + CheckSum = &nt_hdr64.OptionalHeader.CheckSum; + + nt_hdr = &nt_hdr64; + nt_hdr_size = sizeof(IMAGE_NT_HEADERS64); + } + else + return FALSE; + + hMapping = CreateFileMappingW(handle, NULL, PAGE_READONLY, 0, 0, NULL); + + if (!hMapping) + return FALSE; + + BaseAddress = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0); + + if (!BaseAddress) + { + CloseHandle(hMapping); + return FALSE; + } + + FileLength = GetFileSize(handle, NULL); + + *CheckSum = 0; + CheckSumMappedFile(BaseAddress, FileLength, &HeaderSum, CheckSum); + + UnmapViewOfFile(BaseAddress); + CloseHandle(hMapping); + + if (*CheckSum) + { + /* write the header back again */ + count = SetFilePointer(handle, pe_offset, NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return FALSE; + + count = 0; + + r = WriteFile(handle, nt_hdr, nt_hdr_size, &count, NULL); + + if (!r) + return FALSE; + + if (count != nt_hdr_size) + return FALSE; + + return TRUE; + } + + return FALSE; +} /*********************************************************************** * ImageAddCertificate (IMAGEHLP.@) @@ -392,6 +474,9 @@ BOOL WINAPI ImageAddCertificate( if (!IMAGEHLP_SetSecurityDirOffset(FileHandle, sd_VirtualAddr, size)) return FALSE; + if (!IMAGEHLP_RecalculateChecksum(FileHandle)) + return FALSE; + return TRUE; } @@ -636,6 +721,9 @@ BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) if (!r) return FALSE; + if (!IMAGEHLP_RecalculateChecksum(FileHandle)) + return FALSE; + return TRUE; error:

1 0

Rob Shearman : hlink: Fix more memory leaks in tests.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 74e5e0b33f59883177a37a590b2b39973483ba9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e5e0b33f59883177a37a590… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Dec 4 15:08:56 2009 +0000 hlink: Fix more memory leaks in tests. --- dlls/hlink/tests/hlink.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index fc00998..1a7536f 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1044,6 +1044,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* set location => two */ hres = IHlink_SetMonikerReference(hlink, HLINKSETF_LOCATION, dummy2, two); @@ -1053,6 +1054,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* set target => dummy2 */ hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET, dummy2, one);

1 0

Rob Shearman : netapi32: Fix off-by-one errors in ACCESS_QueryAdminDisplayInformation and ACCESS_QueryGuestDisplayInformation .
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 0450235db446f845766a42acd7e465de388e0ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0450235db446f845766a42acd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Dec 4 15:09:02 2009 +0000 netapi32: Fix off-by-one errors in ACCESS_QueryAdminDisplayInformation and ACCESS_QueryGuestDisplayInformation. --- dlls/netapi32/access.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 0044035..7170259 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -494,7 +494,7 @@ static void ACCESS_QueryAdminDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD p PNET_DISPLAY_USER usr; /* set up buffer */ - name_sz = lstrlenW(sAdminUserName); + name_sz = lstrlenW(sAdminUserName) + 1; comment_sz = 1; full_name_sz = 1; @@ -533,7 +533,7 @@ static void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD p PNET_DISPLAY_USER usr; /* set up buffer */ - name_sz = lstrlenW(sGuestUserName); + name_sz = lstrlenW(sGuestUserName) + 1; comment_sz = 1; full_name_sz = 1;

1 0

James Hawkins : oleaut32: Add tests for DispGetParam. Fix two issues that crashed the tests.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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

Rob Shearman : ole32: Add tests for HGLOBAL stream ignoring the HighPart of the offset for seeks .
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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

Rob Shearman : ole32: Initialise all of position variables in test_save_load_filemoniker.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

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