September 2012 - Wine-Commits

Jacek Caban : vbscript: Added ScriptDisp::GetIDsOfNames implementation.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: ba611c0d3a4f091da0028d16a047fc7295510355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba611c0d3a4f091da0028d16a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:26:03 2012 +0200 vbscript: Added ScriptDisp::GetIDsOfNames implementation. --- dlls/vbscript/tests/vbscript.c | 7 ++++++- dlls/vbscript/vbdisp.c | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 27153f8..3dd64dd 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -350,13 +350,18 @@ static void parse_script(IActiveScriptParse *parse, const char *src) #define get_disp_id(a,b,c,d) _get_disp_id(__LINE__,a,b,c,d) static void _get_disp_id(unsigned line, IDispatchEx *dispex, const char *name, HRESULT exhres, DISPID *id) { + DISPID id2; BSTR str; HRESULT hres; str = a2bstr(name); hres = IDispatchEx_GetDispID(dispex, str, 0, id); - SysFreeString(str); ok_(__FILE__,line)(hres == exhres, "GetDispID(%s) returned %08x, expected %08x\n", name, hres, exhres); + + hres = IDispatchEx_GetIDsOfNames(dispex, &IID_NULL, &str, 1, 0, &id2); + SysFreeString(str); + ok_(__FILE__,line)(hres == exhres, "GetIDsOfNames(%s) returned %08x, expected %08x\n", name, hres, exhres); + ok_(__FILE__,line)(*id == id2, "GetIDsOfNames(%s) id != id2\n", name); } static void test_no_script_dispatch(IActiveScript *script) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1b2b8fe..8b0e4f2 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -682,13 +682,22 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC } static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, - DISPID *rgDispId) + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + UINT i; + HRESULT hres; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + + for(i=0; i < cNames; i++) { + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); + if(FAILED(hres)) + return hres; + } + + return S_OK; } static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember,

1 0

Dmitry Timoshkov : windowscodecs: Create frame metadata readers from GIF decoder data.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: a0ca998e08b7fe0d9464f0be74a248a334025693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ca998e08b7fe0d9464f0be7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 13:01:27 2012 +0900 windowscodecs: Create frame metadata readers from GIF decoder data. --- dlls/windowscodecs/gifformat.c | 162 +++++++++++++++-------------------- dlls/windowscodecs/tests/metadata.c | 5 - 2 files changed, 70 insertions(+), 97 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 4adcf17..e3c2661 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -547,6 +547,37 @@ static IStream *create_stream(const void *data, int data_size) return FAILED(hr) ? NULL : stream; } +static HRESULT create_metadata_reader(const void *data, int data_size, + const CLSID *clsid, IWICMetadataReader **reader) +{ + HRESULT hr; + IWICMetadataReader *metadata_reader; + IWICPersistStream *persist; + IStream *stream; + + /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ + + hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&metadata_reader); + if (FAILED(hr)) return hr; + + hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); + if (FAILED(hr)) + { + IWICMetadataReader_Release(metadata_reader); + return hr; + } + + stream = create_stream(data, data_size); + IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); + IStream_Release(stream); + + IWICPersistStream_Release(persist); + + *reader = metadata_reader; + return S_OK; +} + typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICMetadataBlockReader IWICMetadataBlockReader_iface; @@ -850,19 +881,6 @@ static HRESULT WINAPI GifFrameDecode_Block_GetContainerFormat(IWICMetadataBlockR return S_OK; } -static const void *get_GCE_data(GifFrameDecode *This) -{ - int i; - - for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; i++) - { - if (This->frame->Extensions.ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE && - This->frame->Extensions.ExtensionBlocks[i].ByteCount == 8) - return This->frame->Extensions.ExtensionBlocks[i].Bytes + 3; - } - return NULL; -} - static HRESULT WINAPI GifFrameDecode_Block_GetCount(IWICMetadataBlockReader *iface, UINT *count) { @@ -872,8 +890,7 @@ static HRESULT WINAPI GifFrameDecode_Block_GetCount(IWICMetadataBlockReader *ifa if (!count) return E_INVALIDARG; - *count = 1; - if (get_GCE_data(This)) *count += 1; + *count = This->frame->Extensions.ExtensionBlockCount + 1; return S_OK; } @@ -926,64 +943,56 @@ static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataRead return S_OK; } -static HRESULT create_GCE_metadata_reader(const void *GCE_data, IWICMetadataReader **reader) -{ - HRESULT hr; - IWICMetadataReader *metadata_reader; - IWICPersistStream *persist; - IStream *stream; - - /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ - - hr = CoCreateInstance(&CLSID_WICGCEMetadataReader, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICMetadataReader, (void **)&metadata_reader); - if (FAILED(hr)) return hr; - - hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); - if (FAILED(hr)) - { - IWICMetadataReader_Release(metadata_reader); - return hr; - } - - stream = create_stream(GCE_data, 4); - IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); - IStream_Release(stream); - - IWICPersistStream_Release(persist); - - *reader = metadata_reader; - return S_OK; -} - static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader) { GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); - UINT block_count = 1; - const void *GCE_data; + int i, gce_index = -1, gce_skipped = 0; TRACE("(%p,%u,%p)\n", iface, index, reader); - GCE_data = get_GCE_data(This); - if (GCE_data) block_count++; - /* FIXME: add support for Application Extension metadata block - APE_data = get_APE_data(This); - if (APE_data) block_count++; - */ - if (!reader || index >= block_count) return E_INVALIDARG; + if (!reader) return E_INVALIDARG; if (index == 0) return create_IMD_metadata_reader(This, reader); - if (index == 1 && GCE_data) - return create_GCE_metadata_reader(GCE_data, reader); + if (index >= This->frame->Extensions.ExtensionBlockCount + 1) + return E_INVALIDARG; - /* FIXME: add support for Application Extension metadata block - if (APE_data) - return create_APE_metadata_reader(APE_data, reader); - */ - return E_INVALIDARG; + for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; i++) + { + const CLSID *clsid; + const void *data; + int data_size; + + if (index != i + 1 - gce_skipped) continue; + + if (This->frame->Extensions.ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE) + { + gce_index = i; + gce_skipped = 1; + continue; + } + else if (This->frame->Extensions.ExtensionBlocks[i].Function == COMMENT_EXT_FUNC_CODE) + { + clsid = &CLSID_WICGifCommentMetadataReader; + data = This->frame->Extensions.ExtensionBlocks[i].Bytes; + data_size = This->frame->Extensions.ExtensionBlocks[i].ByteCount; + } + else + { + clsid = &CLSID_WICUnknownMetadataReader; + data = This->frame->Extensions.ExtensionBlocks[i].Bytes; + data_size = This->frame->Extensions.ExtensionBlocks[i].ByteCount; + } + return create_metadata_reader(data, data_size, clsid, reader); + } + + if (gce_index == -1) return E_INVALIDARG; + + return create_metadata_reader(This->frame->Extensions.ExtensionBlocks[gce_index].Bytes + 3, + This->frame->Extensions.ExtensionBlocks[gce_index].ByteCount - 4, + &CLSID_WICGCEMetadataReader, reader); } static HRESULT WINAPI GifFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, @@ -1295,37 +1304,6 @@ static HRESULT WINAPI GifDecoder_Block_GetCount(IWICMetadataBlockReader *iface, return S_OK; } -static HRESULT create_metadata_reader(const void *data, int data_size, - const CLSID *clsid, IWICMetadataReader **reader) -{ - HRESULT hr; - IWICMetadataReader *metadata_reader; - IWICPersistStream *persist; - IStream *stream; - - /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ - - hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICMetadataReader, (void **)&metadata_reader); - if (FAILED(hr)) return hr; - - hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); - if (FAILED(hr)) - { - IWICMetadataReader_Release(metadata_reader); - return hr; - } - - stream = create_stream(data, data_size); - IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); - IStream_Release(stream); - - IWICPersistStream_Release(persist); - - *reader = metadata_reader; - return S_OK; -} - static HRESULT WINAPI GifDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader) { diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 343b873..9f5f4e3 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1306,7 +1306,6 @@ static void test_metadata_gif(void) hr = IWICMetadataBlockReader_GetCount(blockreader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); -todo_wine ok(count == 4, "expected 4, got %u\n", count); hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); @@ -1333,13 +1332,11 @@ todo_wine if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); -todo_wine ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ "wrong container format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); -todo_wine ok(count == sizeof(animated_gif_comment_2)/sizeof(animated_gif_comment_2[0]), "unexpected count %u\n", count); if (count == 1) @@ -1349,7 +1346,6 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 2, &reader); -todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr)) @@ -1368,7 +1364,6 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 3, &reader); -todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : winex11: Add window data locking to the system tray functions.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 41d0316522f35cecc5cafbbe48bdfe7443b69dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d0316522f35cecc5cafbbe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 11:17:32 2012 +0200 winex11: Add window data locking to the system tray functions. --- dlls/winex11.drv/systray.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 4d9d837..819b542 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -564,8 +564,11 @@ static BOOL hide_icon( struct tray_icon *icon ) if (!icon->window) return TRUE; /* already hidden */ /* make sure we don't try to unmap it, it confuses some systray docks */ - if ((data = X11DRV_get_win_data( icon->window )) && data->embedded) data->mapped = FALSE; - + if ((data = get_win_data( icon->window ))) + { + if (data->embedded) data->mapped = FALSE; + release_win_data( data ); + } DestroyWindow(icon->window); DestroyWindow(icon->tooltip); icon->window = 0; @@ -613,8 +616,8 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) if (icon->display != -1) InvalidateRect( icon->window, NULL, TRUE ); else { - struct x11drv_win_data *data = X11DRV_get_win_data( icon->window ); - if (data) XClearArea( gdi_display, data->whole_window, 0, 0, 0, 0, True ); + Window win = X11DRV_get_whole_window( icon->window ); + if (win) XClearArea( gdi_display, win, 0, 0, 0, 0, True ); } } }

1 0

Dmitry Timoshkov : windowscodecs: GIF decoder should append a sub-block to current extension.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: aaa682950d4fa818dc08810de927f18dfcab8767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa682950d4fa818dc08810de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 12:59:11 2012 +0900 windowscodecs: GIF decoder should append a sub-block to current extension. --- dlls/windowscodecs/ungif.c | 50 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 7984e3a..2330192 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -222,6 +222,32 @@ AddExtensionBlock(Extensions *New, return (GIF_OK); } +static int +AppendExtensionBlock(Extensions *New, + int Len, + const unsigned char ExtData[]) +{ + ExtensionBlock *ep; + + if (New->ExtensionBlocks == NULL) + return (GIF_ERROR); + + ep = &New->ExtensionBlocks[New->ExtensionBlockCount - 1]; + + ep->Bytes = ungif_realloc(ep->Bytes, ep->ByteCount + Len + 1); + if (ep->Bytes == NULL) + return (GIF_ERROR); + + if (ExtData) + { + ep->Bytes[ep->ByteCount] = Len; + memcpy(ep->Bytes + ep->ByteCount + 1, ExtData, Len); + ep->ByteCount += Len + 1; + } + + return (GIF_OK); +} + static void FreeExtension(Extensions *Extensions) { @@ -898,16 +924,30 @@ DGifSlurp(GifFileType * GifFile) { Extensions->Function = Function; + /* Create an extension block with our data */ + if (AddExtensionBlock(Extensions, ExtData[0], &ExtData[1]) == GIF_ERROR) + return (GIF_ERROR); + while (ExtData != NULL) { + int Len; + GifByteType *Data; - /* Create an extension block with our data */ - if (AddExtensionBlock(Extensions, ExtData[0], &ExtData[1]) - == GIF_ERROR) + if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) return (GIF_ERROR); - if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) + if (ExtData) + { + Len = ExtData[0]; + Data = &ExtData[1]; + } + else + { + Len = 0; + Data = NULL; + } + + if (AppendExtensionBlock(Extensions, Len, Data) == GIF_ERROR) return (GIF_ERROR); - temp_save.Function = 0; } break; }

1 0

Dmitry Timoshkov : windowscodecs: Create global metadata readers from GIF decoder data.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 609b9a4da8778ecc72985f7c03a924e64264ab29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=609b9a4da8778ecc72985f7c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 13:00:33 2012 +0900 windowscodecs: Create global metadata readers from GIF decoder data. --- dlls/windowscodecs/gifformat.c | 38 +++++++++++++++++++++++++++++----- dlls/windowscodecs/tests/metadata.c | 4 --- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 7b88735..4adcf17 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1285,15 +1285,18 @@ static HRESULT WINAPI GifDecoder_Block_GetContainerFormat(IWICMetadataBlockReade static HRESULT WINAPI GifDecoder_Block_GetCount(IWICMetadataBlockReader *iface, UINT *count) { + GifDecoder *This = impl_from_IWICMetadataBlockReader(iface); + TRACE("%p,%p\n", iface, count); if (!count) return E_INVALIDARG; - *count = 1; + *count = This->gif->Extensions.ExtensionBlockCount + 1; return S_OK; } -static HRESULT create_LSD_metadata_reader(GifDecoder *This, IWICMetadataReader **reader) +static HRESULT create_metadata_reader(const void *data, int data_size, + const CLSID *clsid, IWICMetadataReader **reader) { HRESULT hr; IWICMetadataReader *metadata_reader; @@ -1302,7 +1305,7 @@ static HRESULT create_LSD_metadata_reader(GifDecoder *This, IWICMetadataReader * /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ - hr = CoCreateInstance(&CLSID_WICLSDMetadataReader, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void **)&metadata_reader); if (FAILED(hr)) return hr; @@ -1313,7 +1316,7 @@ static HRESULT create_LSD_metadata_reader(GifDecoder *This, IWICMetadataReader * return hr; } - stream = create_stream(This->LSD_data, sizeof(This->LSD_data)); + stream = create_stream(data, data_size); IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); IStream_Release(stream); @@ -1327,12 +1330,35 @@ static HRESULT WINAPI GifDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader UINT index, IWICMetadataReader **reader) { GifDecoder *This = impl_from_IWICMetadataBlockReader(iface); + int i; TRACE("(%p,%u,%p)\n", iface, index, reader); - if (!reader || index != 0) return E_INVALIDARG; + if (!reader) return E_INVALIDARG; + + if (index == 0) + return create_metadata_reader(&This->LSD_data, sizeof(This->LSD_data), + &CLSID_WICLSDMetadataReader, reader); + + for (i = 0; i < This->gif->Extensions.ExtensionBlockCount; i++) + { + const CLSID *clsid; + + if (index != i + 1) continue; + + if (This->gif->Extensions.ExtensionBlocks[i].Function == APPLICATION_EXT_FUNC_CODE) + clsid = &CLSID_WICAPEMetadataReader; + else if (This->gif->Extensions.ExtensionBlocks[i].Function == COMMENT_EXT_FUNC_CODE) + clsid = &CLSID_WICGifCommentMetadataReader; + else + clsid = &CLSID_WICUnknownMetadataReader; - return create_LSD_metadata_reader(This, reader); + return create_metadata_reader(This->gif->Extensions.ExtensionBlocks[i].Bytes, + This->gif->Extensions.ExtensionBlocks[i].ByteCount, + clsid, reader); + } + + return E_INVALIDARG; } static HRESULT WINAPI GifDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index ed02e2f..343b873 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1204,7 +1204,6 @@ static void test_metadata_gif(void) hr = IWICMetadataBlockReader_GetCount(blockreader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); -todo_wine ok(count == 4, "expected 4, got %u\n", count); hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); @@ -1226,7 +1225,6 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 1, &reader); -todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr)) @@ -1245,7 +1243,6 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 2, &reader); -todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr)) @@ -1264,7 +1261,6 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 3, &reader); -todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr))

1 0

Dmitry Timoshkov : windowscodecs: GIF decoder should add header and trailer to extension blocks.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 47864728792e14287f6619e05444afcc3dc940a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47864728792e14287f6619e05… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 12:59:50 2012 +0900 windowscodecs: GIF decoder should add header and trailer to extension blocks. Metadata readers now have access to complete and correctly formatted data stream. --- dlls/windowscodecs/gifformat.c | 4 ++-- dlls/windowscodecs/ungif.c | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 05bf2db..7b88735 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -857,8 +857,8 @@ static const void *get_GCE_data(GifFrameDecode *This) for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; i++) { if (This->frame->Extensions.ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE && - This->frame->Extensions.ExtensionBlocks[i].ByteCount == 4) - return This->frame->Extensions.ExtensionBlocks[i].Bytes; + This->frame->Extensions.ExtensionBlocks[i].ByteCount == 8) + return This->frame->Extensions.ExtensionBlocks[i].Bytes + 3; } return NULL; } diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 2330192..0f55242 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -209,13 +209,18 @@ AddExtensionBlock(Extensions *New, ep = &New->ExtensionBlocks[New->ExtensionBlockCount++]; - ep->ByteCount=Len; - ep->Bytes = ungif_alloc(ep->ByteCount); + ep->ByteCount=Len + 3; + ep->Bytes = ungif_alloc(ep->ByteCount + 3); if (ep->Bytes == NULL) return (GIF_ERROR); + /* Extension Header */ + ep->Bytes[0] = 0x21; + ep->Bytes[1] = New->Function; + ep->Bytes[2] = Len; + if (ExtData) { - memcpy(ep->Bytes, ExtData, Len); + memcpy(ep->Bytes + 3, ExtData, Len); ep->Function = New->Function; } @@ -238,12 +243,12 @@ AppendExtensionBlock(Extensions *New, if (ep->Bytes == NULL) return (GIF_ERROR); + ep->Bytes[ep->ByteCount] = Len; + if (ExtData) - { - ep->Bytes[ep->ByteCount] = Len; memcpy(ep->Bytes + ep->ByteCount + 1, ExtData, Len); - ep->ByteCount += Len + 1; - } + + ep->ByteCount += Len + 1; return (GIF_OK); }

1 0

Alexandre Julliard : winex11: Add window data locking to the drag and drop functions.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 731e497a8737b3656e50245219fe323f9a73f148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731e497a8737b3656e5024521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 11:37:33 2012 +0200 winex11: Add window data locking to the drag and drop functions. --- dlls/winex11.drv/event.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1134316..0e8ba04 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1286,23 +1286,24 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) unsigned long aux_long; unsigned char* p_data = NULL; Atom atom_aux; - int x, y, dummy; + int x, y, cx, cy, dummy; BOOL bAccept; Window win, w_aux_root, w_aux_child; - win = X11DRV_get_whole_window(hWnd); + if (!(data = get_win_data( hWnd ))) return; + cx = data->whole_rect.right - data->whole_rect.left; + cy = data->whole_rect.bottom - data->whole_rect.top; + win = data->whole_window; + release_win_data( data ); + XQueryPointer( event->display, win, &w_aux_root, &w_aux_child, &x, &y, &dummy, &dummy, (unsigned int*)&aux_long); x += virtual_screen_rect.left; y += virtual_screen_rect.top; - if (!(data = X11DRV_get_win_data( hWnd ))) return; - /* find out drop point and drop window */ - if( x < 0 || y < 0 || - x > (data->whole_rect.right - data->whole_rect.left) || - y > (data->whole_rect.bottom - data->whole_rect.top) ) - { + if (x < 0 || y < 0 || x > cx || y > cy) + { bAccept = GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES; x = 0; y = 0; @@ -1439,7 +1440,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) hDrop = GlobalAlloc( GMEM_SHARE, drop_len ); lpDrop = GlobalLock( hDrop ); - if( lpDrop && (win_data = X11DRV_get_win_data( hWnd ))) + if( lpDrop && (win_data = get_win_data( hWnd ))) { lpDrop->pFiles = sizeof(DROPFILES); lpDrop->pt.x = x; @@ -1451,6 +1452,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) y > (win_data->client_rect.bottom - win_data->whole_rect.top) ); lpDrop->fWide = FALSE; p_drop = (char*)(lpDrop + 1); + release_win_data( win_data ); } /* create message content */

1 0

Jacek Caban : vbscript: Fixed parsing if statements with empty body.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 20b2d057d239a4f2eb8f6b0374d1183c322aaeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b2d057d239a4f2eb8f6b037… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:25:14 2012 +0200 vbscript: Fixed parsing if statements with empty body. --- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index baac315..d5a9934 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -228,7 +228,7 @@ Step_opt | tSTEP Expression { $$ = $2; } IfStatement - : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF + : tIF Expression tTHEN tNL StatementsNl_opt ElseIfs_opt Else_opt tEND tIF { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } | tIF Expression tTHEN Statement { $$ = new_if_statement(ctx, $2, $4, NULL, NULL); CHECK_ERROR; } | tIF Expression tTHEN Statement tELSE Statement EndIf_opt @@ -247,12 +247,12 @@ ElseIfs | ElseIf ElseIfs { $1->next = $2; $$ = $1; } ElseIf - : tELSEIF Expression tTHEN tNL StatementsNl + : tELSEIF Expression tTHEN tNL StatementsNl_opt { $$ = new_elseif_decl(ctx, $2, $5); } Else_opt : /* empty */ { $$ = NULL; } - | tELSE tNL StatementsNl { $$ = $3; } + | tELSE tNL StatementsNl_opt { $$ = $3; } CaseClausules : /* empty */ { $$ = NULL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 90d5304..fd93df6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -290,6 +290,22 @@ while not (x and y) wend call ok((x and y), "x or y is false after while") +if false then +' empty body +end if + +if false then + x = false +elseif true then +' empty body +end if + +if false then + x = false +else +' empty body +end if + while false wend

1 0

Dmitry Timoshkov : windowscodecs: Correct some typos.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 45504e90efb29b3ecdfc7aef288c4de94e596d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45504e90efb29b3ecdfc7aef2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 13:02:10 2012 +0900 windowscodecs: Correct some typos. --- dlls/windowscodecs/tests/metadata.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 9f5f4e3..928cba0 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1112,7 +1112,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), /* Logical Screen Descriptor */ - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1160,7 +1160,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), /* Image Descriptor */ - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1213,7 +1213,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatLSD), /* Logical Screen Descriptor */ - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1231,7 +1231,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatAPE), /* Application Extension */ - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1249,7 +1249,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1267,7 +1267,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1315,7 +1315,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), /* Image Descriptor */ - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1333,7 +1333,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1352,7 +1352,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); @@ -1370,7 +1370,7 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), /* Graphic Control Extension */ - "wrong container format %s\n", debugstr_guid(&format)); + "wrong metadata format %s\n", debugstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr);

1 0

Alexandre Julliard : winex11: Add a helper function to set input focus for non-managed windows.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: b8edf184ee33acce8b102d968e4bd5063ab97dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8edf184ee33acce8b102d968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 11:20:07 2012 +0200 winex11: Add a helper function to set input focus for non-managed windows. --- dlls/winex11.drv/event.c | 44 +++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 30 ------------------------------ 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 0e8ba04..1c0cec3 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -530,6 +530,31 @@ static inline BOOL can_activate_window( HWND hwnd ) /********************************************************************** + * set_input_focus + * + * Try to force focus for non-managed windows. + */ +static void set_input_focus( Display *display, Window window ) +{ + XWindowChanges changes; + DWORD timestamp; + + if (!window) return; + + if (EVENT_x11_time_to_win32_time(0)) + /* ICCCM says don't use CurrentTime, so try to use last message time if possible */ + /* FIXME: this is not entirely correct */ + timestamp = GetMessageTime() - EVENT_x11_time_to_win32_time(0); + else + timestamp = CurrentTime; + + /* Set X focus and install colormap */ + changes.stack_mode = Above; + XConfigureWindow( display, window, CWStackMode, &changes ); + XSetInputFocus( display, window, RevertToParent, timestamp ); +} + +/********************************************************************** * set_focus */ static void set_focus( Display *display, HWND hwnd, Time time ) @@ -855,7 +880,8 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) if (!data->managed) { HWND hwndFocus = GetFocus(); - if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ + if (hwndFocus && IsChild( hwnd, hwndFocus )) + set_input_focus( thread_display(), data->whole_window ); } } @@ -1240,6 +1266,22 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) } +/***************************************************************** + * SetFocus (X11DRV.@) + * + * Set the X focus. + */ +void CDECL X11DRV_SetFocus( HWND hwnd ) +{ + Display *display = thread_display(); + struct x11drv_win_data *data; + + if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; + if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!data->managed) set_input_focus( display, data->whole_window ); +} + + static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) { RECT tempRect; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 421d67d..94edb81 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1989,36 +1989,6 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) } -/***************************************************************** - * SetFocus (X11DRV.@) - * - * Set the X focus. - */ -void CDECL X11DRV_SetFocus( HWND hwnd ) -{ - Display *display = thread_display(); - struct x11drv_win_data *data; - XWindowChanges changes; - DWORD timestamp; - - if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (data->managed || !data->whole_window) return; - - if (EVENT_x11_time_to_win32_time(0)) - /* ICCCM says don't use CurrentTime, so try to use last message time if possible */ - /* FIXME: this is not entirely correct */ - timestamp = GetMessageTime() - EVENT_x11_time_to_win32_time(0); - else - timestamp = CurrentTime; - - /* Set X focus and install colormap */ - changes.stack_mode = Above; - XConfigureWindow( display, data->whole_window, CWStackMode, &changes ); - XSetInputFocus( display, data->whole_window, RevertToParent, timestamp ); -} - - static inline RECT get_surface_rect( const RECT *visible_rect ) { RECT rect;

1 0