August 2009 - Wine-Commits - list.winehq.org

Jacek Caban : urlmon: Fixed report_data for recursive calls.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: 3d03ccf2530903a84eab4696f70e36cb51782a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d03ccf2530903a84eab4696f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 00:14:59 2009 +0200 urlmon: Fixed report_data for recursive calls. --- dlls/urlmon/bindprot.c | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 14573a8..63f2375 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -703,7 +703,7 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv, TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - if(This->buf) { + if(This->buf_size) { read = min(cb, This->buf_size); memcpy(pv, This->buf, read); @@ -1028,37 +1028,52 @@ static HRESULT report_data(BindProtocol *This, DWORD bscf, ULONG progress, ULONG return S_OK; if((This->pi & PI_MIMEVERIFICATION) && !This->reported_mime) { + BYTE buf[BUFFER_SIZE]; DWORD read = 0; LPWSTR mime; HRESULT hres; - if(!This->buf) { - This->buf = heap_alloc(BUFFER_SIZE); - if(!This->buf) - return E_OUTOFMEMORY; - } - do { read = 0; - hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, - BUFFER_SIZE-This->buf_size, &read); + hres = IInternetProtocol_Read(This->protocol, buf, + sizeof(buf)-This->buf_size, &read); if(FAILED(hres) && hres != E_PENDING) return hres; + + if(!This->buf) { + This->buf = heap_alloc(BUFFER_SIZE); + if(!This->buf) + return E_OUTOFMEMORY; + }else if(read + This->buf_size > BUFFER_SIZE) { + BYTE *tmp; + + tmp = heap_realloc(This->buf, read+This->buf_size); + if(!tmp) + return E_OUTOFMEMORY; + This->buf = tmp; + } + + memcpy(This->buf+This->buf_size, buf, read); This->buf_size += read; }while(This->buf_size < MIME_TEST_SIZE && hres == S_OK); if(This->buf_size < MIME_TEST_SIZE && hres != S_FALSE) return S_OK; - hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), - This->mime, 0, &mime, 0); - if(FAILED(hres)) - return hres; + if(!This->reported_mime) { + hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), + This->mime, 0, &mime, 0); + if(FAILED(hres)) + return hres; - mime_available(This, mime, TRUE); - CoTaskMemFree(mime); + mime_available(This, mime, TRUE); + CoTaskMemFree(mime); + } } + if(!This->protocol_sink) + return S_OK; + return IInternetProtocolSink_ReportData(This->protocol_sink, bscf, progress, progress_max); }

1 0

Jacek Caban : urlmon: Added IWinInetHttpInfo stub implementation to BindProtocol object.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: 6927eecd6d356a50d50dce3c1eefe9258267f38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6927eecd6d356a50d50dce3c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 00:14:41 2009 +0200 urlmon: Added IWinInetHttpInfo stub implementation to BindProtocol object. --- dlls/urlmon/bindprot.c | 87 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 81 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index aef8c23..14573a8 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -38,6 +38,7 @@ struct BindProtocol { const IInternetPriorityVtbl *lpInternetPriorityVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; const IInternetProtocolSinkVtbl *lpIInternetProtocolSinkVtbl; + const IWinInetHttpInfoVtbl *lpIWinInetHttpInfoVtbl; const IInternetProtocolVtbl *lpIInternetProtocolHandlerVtbl; @@ -73,6 +74,7 @@ struct BindProtocol { #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) #define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define HTTPINFO(x) ((IWinInetHttpInfo*) &(x)->lpIWinInetHttpInfoVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define PROTOCOLHANDLER(x) ((IInternetProtocol*) &(x)->lpIInternetProtocolHandlerVtbl) @@ -316,15 +318,41 @@ static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocol *iface, REFI }else if(IsEqualGUID(&IID_IInternetProtocolSink, riid)) { TRACE("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv); *ppv = PROTSINK(This); - } + }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { + TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); - if(*ppv) { - IInternetProtocol_AddRef(iface); - return S_OK; + if(This->protocol) { + IWinInetInfo *inet_info; + HRESULT hres; + + hres = IInternetProtocol_QueryInterface(This->protocol, &IID_IWinInetInfo, (void**)&inet_info); + if(SUCCEEDED(hres)) { + *ppv = HTTPINFO(This); + IWinInetInfo_Release(inet_info); + } + } + }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); + + if(This->protocol) { + IWinInetHttpInfo *http_info; + HRESULT hres; + + hres = IInternetProtocol_QueryInterface(This->protocol, &IID_IWinInetHttpInfo, (void**)&http_info); + if(SUCCEEDED(hres)) { + *ppv = HTTPINFO(This); + IWinInetHttpInfo_Release(http_info); + } + } + }else { + WARN("not supported interface %s\n", debugstr_guid(riid)); } - WARN("not supported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + if(!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI BindProtocol_AddRef(IInternetProtocol *iface) @@ -1138,6 +1166,52 @@ static const IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { BPInternetProtocolSink_ReportResult }; +#define INETINFO_THIS(iface) DEFINE_THIS(BindProtocol, IWinInetHttpInfo, iface) + +static HRESULT WINAPI WinInetHttpInfo_QueryInterface(IWinInetHttpInfo *iface, REFIID riid, void **ppv) +{ + BindProtocol *This = INETINFO_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI WinInetHttpInfo_AddRef(IWinInetHttpInfo *iface) +{ + BindProtocol *This = INETINFO_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI WinInetHttpInfo_Release(IWinInetHttpInfo *iface) +{ + BindProtocol *This = INETINFO_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer) +{ + BindProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) +{ + BindProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + return E_NOTIMPL; +} + +#undef INETINFO_THIS + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + WinInetHttpInfo_QueryInterface, + WinInetHttpInfo_AddRef, + WinInetHttpInfo_Release, + WinInetHttpInfo_QueryOption, + WinInetHttpInfo_QueryInfo +}; + #define SERVPROV_THIS(iface) DEFINE_THIS(BindProtocol, ServiceProvider, iface) static HRESULT WINAPI BPServiceProvider_QueryInterface(IServiceProvider *iface, @@ -1191,6 +1265,7 @@ HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol ret->lpServiceProviderVtbl = &ServiceProviderVtbl; ret->lpIInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; ret->lpIInternetProtocolHandlerVtbl = &InternetProtocolHandlerVtbl; + ret->lpIWinInetHttpInfoVtbl = &WinInetHttpInfoVtbl; ret->ref = 1; ret->from_urlmon = from_urlmon;

1 0

Andrew Eikum : user32/tests: Fix input test failure in win9x platforms.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: e4106b6273c612334319ddcf1c54863a3dc1bf33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4106b6273c612334319ddcf1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 20 11:43:00 2009 -0500 user32/tests: Fix input test failure in win9x platforms. --- dlls/user32/tests/input.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index dfaf87e..1a834aa 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1122,7 +1122,10 @@ static void test_Input_unicode(void) wclass.lpszMenuName = 0; wclass.cbClsExtra = 0; wclass.cbWndExtra = 0; - RegisterClassW(&wclass); + if(!RegisterClassW(&wclass)){ + win_skip("Unicode functions not supported\n"); + return; + } /* create the test window that will receive the keystrokes */ hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100,

1 0

Andrew Eikum : ole32: Add big block chain to small block chain conversion routine.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: 85a5867308f9d2ca02ad03f0ccb018d1bec98218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a5867308f9d2ca02ad03f0c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 19 15:19:10 2009 -0500 ole32: Add big block chain to small block chain conversion routine. --- dlls/ole32/stg_stream.c | 15 +++++++- dlls/ole32/storage32.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/storage32.h | 4 ++ 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index f9a959d..36486f9 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -537,8 +537,6 @@ static HRESULT WINAPI StgStreamImpl_Seek( * * It will change the size of a stream. * - * TODO: Switch from small blocks to big blocks and vice versa. - * * See the documentation of IStream for more info. */ static HRESULT WINAPI StgStreamImpl_SetSize( @@ -626,6 +624,19 @@ static HRESULT WINAPI StgStreamImpl_SetSize( &This->smallBlockChain); } } + else if ( (This->bigBlockChain!=0) && + (curProperty.size.u.LowPart >= LIMIT_TO_USE_SMALL_BLOCK) ) + { + if (libNewSize.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK) + { + /* + * Transform the big block chain into a small block chain + */ + This->smallBlockChain = Storage32Impl_BigBlocksToSmallBlocks( + This->parentStorage->ancestorStorage, + &This->bigBlockChain); + } + } if (This->smallBlockChain!=0) { diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d8c1d0b..4a27317 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -104,6 +104,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This); static ULONG BlockChainStream_GetCount(BlockChainStream* This); static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This); +static ULONG SmallBlockChainStream_GetHeadOfChain(SmallBlockChainStream* This); static BOOL StorageImpl_WriteDWordToBigBlock( StorageImpl* This, ULONG blockIndex, ULONG offset, DWORD value); static BOOL StorageImpl_ReadDWordFromBigBlock( StorageImpl* This, @@ -3627,6 +3628,86 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( return bigBlockChain; } +/****************************************************************************** + * Storage32Impl_BigBlocksToSmallBlocks + * + * This method will convert a big block chain to a small block chain. + * The big block chain will be destroyed on success. + */ +SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( + StorageImpl* This, + BlockChainStream** ppbbChain) +{ + ULARGE_INTEGER size, offset, cbTotalRead; + ULONG cbRead, cbWritten, propertyIndex, sbHeadOfChain = BLOCK_END_OF_CHAIN; + HRESULT resWrite = S_OK, resRead; + StgProperty chainProperty; + BYTE* buffer; + SmallBlockChainStream* sbTempChain; + + TRACE("%p %p\n", This, ppbbChain); + + sbTempChain = SmallBlockChainStream_Construct(This, &sbHeadOfChain, + PROPERTY_NULL); + + if(!sbTempChain) + return NULL; + + size = BlockChainStream_GetSize(*ppbbChain); + SmallBlockChainStream_SetSize(sbTempChain, size); + + offset.u.HighPart = 0; + offset.u.LowPart = 0; + cbTotalRead.QuadPart = 0; + buffer = HeapAlloc(GetProcessHeap(), 0, This->bigBlockSize); + do + { + resRead = BlockChainStream_ReadAt(*ppbbChain, offset, + This->bigBlockSize, buffer, &cbRead); + + if(FAILED(resRead)) + break; + + if(cbRead > 0) + { + cbTotalRead.QuadPart += cbRead; + + resWrite = SmallBlockChainStream_WriteAt(sbTempChain, offset, + cbRead, buffer, &cbWritten); + + if(FAILED(resWrite)) + break; + + offset.u.LowPart += This->bigBlockSize; + } + }while(cbTotalRead.QuadPart < size.QuadPart); + HeapFree(GetProcessHeap(), 0, buffer); + + size.u.HighPart = 0; + size.u.LowPart = 0; + + if(FAILED(resRead) || FAILED(resWrite)) + { + ERR("conversion failed: resRead = 0x%08x, resWrite = 0x%08x\n", resRead, resWrite); + SmallBlockChainStream_SetSize(sbTempChain, size); + SmallBlockChainStream_Destroy(sbTempChain); + return NULL; + } + + /* destroy the original big block chain */ + propertyIndex = (*ppbbChain)->ownerPropertyIndex; + BlockChainStream_SetSize(*ppbbChain, size); + BlockChainStream_Destroy(*ppbbChain); + *ppbbChain = NULL; + + StorageImpl_ReadProperty(This, propertyIndex, &chainProperty); + chainProperty.startingBlock = sbHeadOfChain; + StorageImpl_WriteProperty(This, propertyIndex, &chainProperty); + + SmallBlockChainStream_Destroy(sbTempChain); + return SmallBlockChainStream_Construct(This, NULL, propertyIndex); +} + static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 68a82bb..fc4af32 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -306,6 +306,10 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( StorageImpl* This, SmallBlockChainStream** ppsbChain); +SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( + StorageImpl* This, + BlockChainStream** ppbbChain); + /**************************************************************************** * StgStreamImpl definitions. *

1 0

Andrew Eikum : ole32: Allow small block chains with no property.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: 972e4a22f83f0799890c5a4ab0356513078fc8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972e4a22f83f0799890c5a4ab… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 19 15:19:07 2009 -0500 ole32: Allow small block chains with no property. --- dlls/ole32/stg_stream.c | 2 + dlls/ole32/storage32.c | 79 ++++++++++++++++++++++++++++++++++++----------- dlls/ole32/storage32.h | 6 ++- 3 files changed, 67 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 9acd414..f9a959d 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -232,6 +232,7 @@ static void StgStreamImpl_OpenBlockChain( { This->smallBlockChain = SmallBlockChainStream_Construct( This->parentStorage->ancestorStorage, + NULL, This->ownerProperty); } else @@ -591,6 +592,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( { This->smallBlockChain = SmallBlockChainStream_Construct( This->parentStorage->ancestorStorage, + NULL, This->ownerProperty); } else diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 90eafb7..d8c1d0b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4579,7 +4579,6 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, * BlockChainStream_WriteAt * * Writes the specified number of bytes to this chain at the specified offset. - * bytesWritten may be NULL. * Will fail if not all specified number of bytes have been written. */ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, @@ -4931,6 +4930,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) SmallBlockChainStream* SmallBlockChainStream_Construct( StorageImpl* parentStorage, + ULONG* headOfStreamPlaceHolder, ULONG propertyIndex) { SmallBlockChainStream* newStream; @@ -4938,6 +4938,7 @@ SmallBlockChainStream* SmallBlockChainStream_Construct( newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(SmallBlockChainStream)); newStream->parentStorage = parentStorage; + newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder; newStream->ownerPropertyIndex = propertyIndex; return newStream; @@ -4960,6 +4961,9 @@ static ULONG SmallBlockChainStream_GetHeadOfChain( StgProperty chainProperty; BOOL readSuccessful; + if (This->headOfStreamPlaceHolder != NULL) + return *(This->headOfStreamPlaceHolder); + if (This->ownerPropertyIndex) { readSuccessful = StorageImpl_ReadProperty( @@ -5322,7 +5326,6 @@ HRESULT SmallBlockChainStream_ReadAt( * SmallBlockChainStream_WriteAt * * Writes the specified number of bytes to this chain at the specified offset. - * bytesWritten may be NULL. * Will fail if not all specified number of bytes have been written. */ HRESULT SmallBlockChainStream_WriteAt( @@ -5362,9 +5365,6 @@ HRESULT SmallBlockChainStream_WriteAt( /* * Start writing the buffer. - * - * Here, I'm casting away the constness on the buffer variable - * This is OK since we don't intend to modify that buffer. */ *bytesWritten = 0; bufferWalker = buffer; @@ -5511,26 +5511,32 @@ static BOOL SmallBlockChainStream_Enlarge( blockIndex = SmallBlockChainStream_GetHeadOfChain(This); /* - * Empty chain + * Empty chain. Create the head. */ if (blockIndex == BLOCK_END_OF_CHAIN) { + blockIndex = SmallBlockChainStream_GetNextFreeBlock(This); + SmallBlockChainStream_SetNextBlockInChain( + This, + blockIndex, + BLOCK_END_OF_CHAIN); - StgProperty chainProp; - - StorageImpl_ReadProperty(This->parentStorage, This->ownerPropertyIndex, - &chainProp); + if (This->headOfStreamPlaceHolder != NULL) + { + *(This->headOfStreamPlaceHolder) = blockIndex; + } + else + { + StgProperty chainProp; - chainProp.startingBlock = SmallBlockChainStream_GetNextFreeBlock(This); + StorageImpl_ReadProperty(This->parentStorage, This->ownerPropertyIndex, + &chainProp); - StorageImpl_WriteProperty(This->parentStorage, This->ownerPropertyIndex, - &chainProp); + chainProp.startingBlock = blockIndex; - blockIndex = chainProp.startingBlock; - SmallBlockChainStream_SetNextBlockInChain( - This, - blockIndex, - BLOCK_END_OF_CHAIN); + StorageImpl_WriteProperty(This->parentStorage, This->ownerPropertyIndex, + &chainProp); + } } currentBlock = blockIndex; @@ -5606,6 +5612,32 @@ BOOL SmallBlockChainStream_SetSize( } /****************************************************************************** + * SmallBlockChainStream_GetCount + * + * Returns the number of small blocks that comprises this chain. + * This is not the size of the stream as the last block may not be full! + * + */ +static ULONG SmallBlockChainStream_GetCount(SmallBlockChainStream* This) +{ + ULONG blockIndex; + ULONG count = 0; + + blockIndex = SmallBlockChainStream_GetHeadOfChain(This); + + while(blockIndex != BLOCK_END_OF_CHAIN) + { + count++; + + if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, + blockIndex, &blockIndex))) + return 0; + } + + return count; +} + +/****************************************************************************** * SmallBlockChainStream_GetSize * * Returns the size of this chain. @@ -5614,6 +5646,17 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) { StgProperty chainProperty; + if(This->headOfStreamPlaceHolder != NULL) + { + ULARGE_INTEGER result; + result.u.HighPart = 0; + + result.u.LowPart = SmallBlockChainStream_GetCount(This) * + This->parentStorage->smallBlockSize; + + return result; + } + StorageImpl_ReadProperty( This->parentStorage, This->ownerPropertyIndex, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4be0631..68a82bb 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -464,14 +464,16 @@ struct SmallBlockChainStream { StorageImpl* parentStorage; ULONG ownerPropertyIndex; + ULONG* headOfStreamPlaceHolder; }; /* * Methods of the SmallBlockChainStream class. */ SmallBlockChainStream* SmallBlockChainStream_Construct( - StorageImpl* parentStorage, - ULONG propertyIndex); + StorageImpl* parentStorage, + ULONG* headOfStreamPlaceHolder, + ULONG propertyIndex); void SmallBlockChainStream_Destroy( SmallBlockChainStream* This);

1 0

Andrew Eikum : ole32: Repair leak on error path.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: 7ca31e83f0f46b1c675dab95483cbb8d18b70259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca31e83f0f46b1c675dab954… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 19 15:19:03 2009 -0500 ole32: Repair leak on error path. --- dlls/ole32/storage32.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 212c1ff..90eafb7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3586,9 +3586,13 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( } while (cbTotalRead.QuadPart < size.QuadPart); HeapFree(GetProcessHeap(),0,buffer); + size.u.HighPart = 0; + size.u.LowPart = 0; + if (FAILED(resRead) || FAILED(resWrite)) { ERR("conversion failed: resRead = 0x%08x, resWrite = 0x%08x\n", resRead, resWrite); + BlockChainStream_SetSize(bbTempChain, size); BlockChainStream_Destroy(bbTempChain); return NULL; } @@ -3597,8 +3601,6 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( * Destroy the small block chain. */ propertyIndex = (*ppsbChain)->ownerPropertyIndex; - size.u.HighPart = 0; - size.u.LowPart = 0; SmallBlockChainStream_SetSize(*ppsbChain, size); SmallBlockChainStream_Destroy(*ppsbChain); *ppsbChain = 0;

1 0

Tony Wasserka : windowscodecs: Add stubs for the IWICStream interface.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: a18fc6ec76893dfbaa096d630473ef2da567f5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18fc6ec76893dfbaa096d630… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Aug 18 17:48:49 2009 +0200 windowscodecs: Add stubs for the IWICStream interface. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/stream.c | 272 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 276 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 30146e4..1e478f6 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ palette.c \ propertybag.c \ regsvr.c \ + stream.c \ ungif.c @MAKE_DLL_RULES@ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 6424e42..a98aeb8 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -256,8 +256,8 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFlipRotator(IWICImagingFactory static HRESULT WINAPI ImagingFactory_CreateStream(IWICImagingFactory *iface, IWICStream **ppIWICStream) { - FIXME("(%p,%p): stub\n", iface, ppIWICStream); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIWICStream); + return StreamImpl_Create(ppIWICStream); } static HRESULT WINAPI ImagingFactory_CreateColorContext(IWICImagingFactory *iface, diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c new file mode 100644 index 0000000..b496b31 --- /dev/null +++ b/dlls/windowscodecs/stream.c @@ -0,0 +1,272 @@ +/* + * Copyright 2009 Tony Wasserka + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "objbase.h" +#include "wincodec.h" +#include "wincodecs_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +/****************************************** + * IWICStream implementation + * + */ +typedef struct IWICStreamImpl +{ + const IWICStreamVtbl *lpVtbl; + LONG ref; + + IStream *pStream; +} IWICStreamImpl; + +static HRESULT WINAPI IWICStreamImpl_QueryInterface(IWICStream *iface, + REFIID iid, void **ppv) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IStream, iid) || + IsEqualIID(&IID_ISequentialStream, iid) || IsEqualIID(&IID_IWICStream, iid)) + { + *ppv = This; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI IWICStreamImpl_AddRef(IWICStream *iface) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI IWICStreamImpl_Release(IWICStream *iface) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) { + if (This->pStream) IStream_Release(This->pStream); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI IWICStreamImpl_Read(IWICStream *iface, + void *pv, ULONG cb, ULONG *pcbRead) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_Read(This->pStream, pv, cb, pcbRead); +} + +static HRESULT WINAPI IWICStreamImpl_Write(IWICStream *iface, + void const *pv, ULONG cb, ULONG *pcbWritten) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_Write(This->pStream, pv, cb, pcbWritten); +} + +static HRESULT WINAPI IWICStreamImpl_Seek(IWICStream *iface, + LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_Seek(This->pStream, dlibMove, dwOrigin, plibNewPosition); +} + +static HRESULT WINAPI IWICStreamImpl_SetSize(IWICStream *iface, + ULARGE_INTEGER libNewSize) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_SetSize(This->pStream, libNewSize); +} + +static HRESULT WINAPI IWICStreamImpl_CopyTo(IWICStream *iface, + IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_CopyTo(This->pStream, pstm, cb, pcbRead, pcbWritten); +} + +static HRESULT WINAPI IWICStreamImpl_Commit(IWICStream *iface, + DWORD grfCommitFlags) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_Commit(This->pStream, grfCommitFlags); +} + +static HRESULT WINAPI IWICStreamImpl_Revert(IWICStream *iface) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_Revert(This->pStream); +} + +static HRESULT WINAPI IWICStreamImpl_LockRegion(IWICStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_LockRegion(This->pStream, libOffset, cb, dwLockType); +} + +static HRESULT WINAPI IWICStreamImpl_UnlockRegion(IWICStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_UnlockRegion(This->pStream, libOffset, cb, dwLockType); +} + +static HRESULT WINAPI IWICStreamImpl_Stat(IWICStream *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_Stat(This->pStream, pstatstg, grfStatFlag); +} + +static HRESULT WINAPI IWICStreamImpl_Clone(IWICStream *iface, + IStream **ppstm) +{ + IWICStreamImpl *This = (IWICStreamImpl*)iface; + TRACE("(%p): relay\n", This); + + if (!This->pStream) return WINCODEC_ERR_NOTINITIALIZED; + return IStream_Clone(This->pStream, ppstm); +} + +static HRESULT WINAPI IWICStreamImpl_InitializeFromIStream(IWICStream *iface, + IStream *pIStream) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface, + LPCWSTR wzFileName, DWORD dwDesiredAccess) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWICStreamImpl_InitializeFromMemory(IWICStream *iface, + BYTE *pbBuffer, DWORD cbBufferSize) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWICStreamImpl_InitializeFromIStreamRegion(IWICStream *iface, + IStream *pIStream, ULARGE_INTEGER ulOffset, ULARGE_INTEGER ulMaxSize) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + + +const IWICStreamVtbl WICStream_Vtbl = +{ + /*** IUnknown methods ***/ + IWICStreamImpl_QueryInterface, + IWICStreamImpl_AddRef, + IWICStreamImpl_Release, + /*** ISequentialStream methods ***/ + IWICStreamImpl_Read, + IWICStreamImpl_Write, + /*** IStream methods ***/ + IWICStreamImpl_Seek, + IWICStreamImpl_SetSize, + IWICStreamImpl_CopyTo, + IWICStreamImpl_Commit, + IWICStreamImpl_Revert, + IWICStreamImpl_LockRegion, + IWICStreamImpl_UnlockRegion, + IWICStreamImpl_Stat, + IWICStreamImpl_Clone, + /*** IWICStream methods ***/ + IWICStreamImpl_InitializeFromIStream, + IWICStreamImpl_InitializeFromFilename, + IWICStreamImpl_InitializeFromMemory, + IWICStreamImpl_InitializeFromIStreamRegion, +}; + +HRESULT StreamImpl_Create(IWICStream **stream) +{ + IWICStreamImpl *pObject; + + if( !stream ) return E_INVALIDARG; + + pObject = HeapAlloc(GetProcessHeap(), 0, sizeof(IWICStreamImpl)); + if( !pObject ) { + *stream = NULL; + return E_OUTOFMEMORY; + } + + pObject->lpVtbl = &WICStream_Vtbl; + pObject->ref = 1; + pObject->pStream = NULL; + + *stream = (IWICStream*)pObject; + + return S_OK; +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 6dcd47e..da6f374 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -26,6 +26,7 @@ extern HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT PaletteImpl_Create(IWICPalette **palette); +extern HRESULT StreamImpl_Create(IWICStream **stream); extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride,

1 0

Alexandre Julliard : user32: Run the explorer process from the system directory.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: e3b395ff2ceac3749778f466c2c9752898dd5010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b395ff2ceac3749778f466c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 17:14:48 2009 +0200 user32: Run the explorer process from the system directory. --- dlls/user32/win.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index da196ed..44b15b1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1785,6 +1785,7 @@ HWND WINAPI GetDesktopWindow(void) static const WCHAR command_line[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; STARTUPINFOW si; PROCESS_INFORMATION pi; + WCHAR systemdir[MAX_PATH]; WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; memset( &si, 0, sizeof(si) ); @@ -1794,10 +1795,11 @@ HWND WINAPI GetDesktopWindow(void) si.hStdOutput = 0; si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - GetSystemDirectoryW( cmdline, MAX_PATH ); + GetSystemDirectoryW( systemdir, MAX_PATH ); + lstrcpyW( cmdline, systemdir ); lstrcatW( cmdline, command_line ); if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, - NULL, NULL, &si, &pi )) + NULL, systemdir, &si, &pi )) { TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); WaitForInputIdle( pi.hProcess, 10000 );

1 0

Jörg Höhle : d3d9/tests: SetAutoGenFilterType tests.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: f2a4c6eeab6fcd69754da1f17ef02ab0eda2f95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a4c6eeab6fcd69754da1f17… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jul 14 04:49:28 2009 +0200 d3d9/tests: SetAutoGenFilterType tests. --- dlls/d3d9/tests/texture.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 4d433b1..2623b13 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -197,6 +197,21 @@ static void test_mipmap_gen(IDirect3DDevice9 *device) D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &texture, 0); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed(%08x)\n", hr); + if (SUCCEEDED(hr)) + { + D3DTEXTUREFILTERTYPE fltt; + fltt = IDirect3DTexture9_GetAutoGenFilterType(texture); + ok(D3DTEXF_LINEAR == fltt /* || broken(D3DTEXF_POINT == fltt)*/, + "GetAutoGenFilterType returned default %d\n", fltt); + hr = IDirect3DTexture9_SetAutoGenFilterType(texture, D3DTEXF_NONE); + todo_wine ok(hr == D3DERR_INVALIDCALL, "SetAutoGenFilterType D3DTEXF_NONE returned %08x\n", hr); + hr = IDirect3DTexture9_SetAutoGenFilterType(texture, D3DTEXF_ANISOTROPIC); + ok(hr == D3D_OK, "SetAutoGenFilterType D3DTEXF_ANISOTROPIC returned %08x\n", hr); + fltt = IDirect3DTexture9_GetAutoGenFilterType(texture); + ok(D3DTEXF_ANISOTROPIC == fltt, "GetAutoGenFilterType returned %d\n", fltt); + hr = IDirect3DTexture9_SetAutoGenFilterType(texture, D3DTEXF_LINEAR); + ok(hr == D3D_OK, "SetAutoGenFilterType D3DTEXF_LINEAR returned %08x\n", hr); + } levels = IDirect3DTexture9_GetLevelCount(texture); ok(levels == 1, "Got %d levels, expected 1\n", levels);

1 0

Alexandre Julliard : msvfw32: Add missing utf8 pragma.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: 2ff209ed2f5804696ec772deb3ab13c06f4f268e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff209ed2f5804696ec772deb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 15:33:26 2009 +0200 msvfw32: Add missing utf8 pragma. --- dlls/msvfw32/msvfw32_Es.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Es.rc b/dlls/msvfw32/msvfw32_Es.rc index 2745361..c5eb635 100644 --- a/dlls/msvfw32/msvfw32_Es.rc +++ b/dlls/msvfw32/msvfw32_Es.rc @@ -19,6 +19,8 @@ #include "msvideo_private.h" +#pragma code_page(65001) + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95

1 0