September 2012 - Wine-Commits

Dmitry Timoshkov : windowscodecs: Create Graphic Control Extension metadata block for a GIF frame.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 664f1c477060e417ea5706391135507f652f98b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664f1c477060e417ea5706391… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 10:27:03 2012 +0900 windowscodecs: Create Graphic Control Extension metadata block for a GIF frame. --- dlls/windowscodecs/gifformat.c | 70 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 2 - 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 62bdc6f..4414f36 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -646,14 +646,30 @@ 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->ExtensionBlockCount; i++) + { + if (This->frame->ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE && + This->frame->ExtensionBlocks[i].ByteCount == 4) + return This->frame->ExtensionBlocks[i].Bytes; + } + return NULL; +} + static HRESULT WINAPI GifFrameDecode_Block_GetCount(IWICMetadataBlockReader *iface, UINT *count) { + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + TRACE("%p,%p\n", iface, count); if (!count) return E_INVALIDARG; *count = 1; + if (get_GCE_data(This)) *count += 1; return S_OK; } @@ -705,16 +721,64 @@ 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; TRACE("(%p,%u,%p)\n", iface, index, reader); - if (!reader || index != 0) return E_INVALIDARG; - - return create_IMD_metadata_reader(This, 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 (index == 0) + return create_IMD_metadata_reader(This, reader); + + if (index == 1 && GCE_data) + return create_GCE_metadata_reader(GCE_data, reader); + + /* FIXME: add support for Application Extension metadata block + if (APE_data) + return create_APE_metadata_reader(APE_data, reader); + */ + return E_INVALIDARG; } static HRESULT WINAPI GifFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 39c5144..11db5cb 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1206,7 +1206,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 == 2, "expected 2, got %u\n", count); hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); @@ -1228,7 +1227,6 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 1, &reader); -todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr))

1 0

Dmitry Timoshkov : windowscodecs: Create Image Descriptor metadata block for a GIF frame.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 003c20467c355a3b251c685252456d2991faa412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003c20467c355a3b251c68525… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 10:26:04 2012 +0900 windowscodecs: Create Image Descriptor metadata block for a GIF frame. --- dlls/windowscodecs/gifformat.c | 164 +++++++++++++++++++++++++++++++---- dlls/windowscodecs/tests/metadata.c | 4 +- 2 files changed, 150 insertions(+), 18 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 66c56a8..62bdc6f 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -149,25 +149,27 @@ HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) return MetadataReader_Create(&LSDReader_Vtbl, pUnkOuter, iid, ppv); } +#include "pshpack1.h" +struct image_descriptor +{ + USHORT left; + USHORT top; + USHORT width; + USHORT height; + BYTE packed; + /* local_color_table_flag : 1; + * interlace_flag : 1; + * sort_flag : 1; + * reserved : 2; + * local_color_table_size : 3; + */ +}; +#include "poppack.h" + static HRESULT load_IMD_metadata(IStream *stream, const GUID *vendor, DWORD options, MetadataItem **items, DWORD *count) { -#include "pshpack1.h" - struct image_descriptor - { - USHORT left; - USHORT top; - USHORT width; - USHORT height; - BYTE packed; - /* local_color_table_flag : 1; - * interlace_flag : 1; - * sort_flag : 1; - * reserved : 2; - * local_color_table_size : 3; - */ - } imd_data; -#include "poppack.h" + struct image_descriptor imd_data; HRESULT hr; ULONG bytesread, i; MetadataItem *result; @@ -353,6 +355,7 @@ typedef struct { typedef struct { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; SavedImage *frame; GifDecoder *parent; @@ -373,6 +376,11 @@ static inline GifFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDec return CONTAINING_RECORD(iface, GifFrameDecode, IWICBitmapFrameDecode_iface); } +static inline GifFrameDecode *frame_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, GifFrameDecode, IWICMetadataBlockReader_iface); +} + static HRESULT WINAPI GifFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { @@ -387,6 +395,10 @@ static HRESULT WINAPI GifFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface { *ppv = &This->IWICBitmapFrameDecode_iface; } + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) + { + *ppv = &This->IWICMetadataBlockReader_iface; + } else { *ppv = NULL; @@ -604,6 +616,125 @@ static const IWICBitmapFrameDecodeVtbl GifFrameDecode_Vtbl = { GifFrameDecode_GetThumbnail }; +static HRESULT WINAPI GifFrameDecode_Block_QueryInterface(IWICMetadataBlockReader *iface, + REFIID iid, void **ppv) +{ + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); +} + +static ULONG WINAPI GifFrameDecode_Block_AddRef(IWICMetadataBlockReader *iface) +{ + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_AddRef(&This->IWICBitmapFrameDecode_iface); +} + +static ULONG WINAPI GifFrameDecode_Block_Release(IWICMetadataBlockReader *iface) +{ + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_Release(&This->IWICBitmapFrameDecode_iface); +} + +static HRESULT WINAPI GifFrameDecode_Block_GetContainerFormat(IWICMetadataBlockReader *iface, + GUID *guid) +{ + TRACE("(%p,%p)\n", iface, guid); + + if (!guid) return E_INVALIDARG; + + *guid = GUID_ContainerFormatGif; + return S_OK; +} + +static HRESULT WINAPI GifFrameDecode_Block_GetCount(IWICMetadataBlockReader *iface, + UINT *count) +{ + TRACE("%p,%p\n", iface, count); + + if (!count) return E_INVALIDARG; + + *count = 1; + return S_OK; +} + +static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataReader **reader) +{ + HRESULT hr; + IWICMetadataReader *metadata_reader; + IWICPersistStream *persist; + IStream *stream; + struct image_descriptor IMD_data; + + /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ + + hr = CoCreateInstance(&CLSID_WICIMDMetadataReader, 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; + } + + /* recreate IMD structure from GIF decoder data */ + IMD_data.left = This->frame->ImageDesc.Left; + IMD_data.top = This->frame->ImageDesc.Top; + IMD_data.width = This->frame->ImageDesc.Width; + IMD_data.height = This->frame->ImageDesc.Height; + IMD_data.packed = 0; + /* interlace_flag */ + IMD_data.packed |= This->frame->ImageDesc.Interlace ? (1 << 6) : 0; + if (This->frame->ImageDesc.ColorMap) + { + /* local_color_table_flag */ + IMD_data.packed |= 1 << 7; + /* local_color_table_size */ + IMD_data.packed |= This->frame->ImageDesc.ColorMap->BitsPerPixel; + /* FIXME: sort_flag */ + } + + stream = create_stream(&IMD_data, sizeof(IMD_data)); + 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); + + TRACE("(%p,%u,%p)\n", iface, index, reader); + + if (!reader || index != 0) return E_INVALIDARG; + + return create_IMD_metadata_reader(This, reader); +} + +static HRESULT WINAPI GifFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, + IEnumUnknown **enumerator) +{ + FIXME("(%p,%p): stub\n", iface, enumerator); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl GifFrameDecode_BlockVtbl = +{ + GifFrameDecode_Block_QueryInterface, + GifFrameDecode_Block_AddRef, + GifFrameDecode_Block_Release, + GifFrameDecode_Block_GetContainerFormat, + GifFrameDecode_Block_GetCount, + GifFrameDecode_Block_GetReaderByIndex, + GifFrameDecode_Block_GetEnumerator +}; + static HRESULT WINAPI GifDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -824,6 +955,7 @@ static HRESULT WINAPI GifDecoder_GetFrame(IWICBitmapDecoder *iface, if (!result) return E_OUTOFMEMORY; result->IWICBitmapFrameDecode_iface.lpVtbl = &GifFrameDecode_Vtbl; + result->IWICMetadataBlockReader_iface.lpVtbl = &GifFrameDecode_BlockVtbl; result->ref = 1; result->frame = &This->gif->SavedImages[index]; IWICBitmapDecoder_AddRef(iface); diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 6bdecee..39c5144 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1088,7 +1088,6 @@ static void test_metadata_gif(void) ok(hr == S_OK, "GetFrame error %#x\n", hr); hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&blockreader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* before Win7 */, "QueryInterface error %#x\n", hr); if (SUCCEEDED(hr)) @@ -1190,7 +1189,6 @@ todo_wine ok(hr == S_OK, "GetFrame error %#x\n", hr); hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&blockreader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* before Win7 */, "QueryInterface error %#x\n", hr); if (SUCCEEDED(hr)) @@ -1208,6 +1206,7 @@ todo_wine hr = IWICMetadataBlockReader_GetCount(blockreader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); +todo_wine ok(count == 2, "expected 2, got %u\n", count); hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); @@ -1229,6 +1228,7 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 1, &reader); +todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr))

1 0

Piotr Caban : msvcrt/tests: Added more RTTI tests.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: b3dff995eec1d59b191b85dde09d1e93018036f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dff995eec1d59b191b85dde… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 13 13:30:13 2012 +0200 msvcrt/tests: Added more RTTI tests. --- dlls/msvcrt/tests/cpp.c | 60 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 140d8b2..8baf9b6 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -840,13 +840,13 @@ static inline void/*rtti_object_locator*/ *get_obj_locator( void *cppobj ) } #ifndef __x86_64__ -#define RTTI_SIGNATURE 0 #define DEFINE_RTTI_REF(type, name) type *name #define RTTI_REF(instance, name) &instance.name +#define RTTI_REF_SIG0(instance, name, base) RTTI_REF(instance, name) #else -#define RTTI_SIGNATURE 1 #define DEFINE_RTTI_REF(type, name) unsigned name #define RTTI_REF(instance, name) FIELD_OFFSET(struct rtti_data, name) +#define RTTI_REF_SIG0(instance, name, base) ((char*)&instance.name-base) #endif /* Test RTTI functions */ static void test_rtti(void) @@ -894,24 +894,33 @@ static void test_rtti(void) { {RTTI_REF(simple_class_rtti, type_info[0]), 0, {0, 0, 0}, 0} }, { {RTTI_REF(simple_class_rtti, base_descriptor[0])} }, {0, 0, 1, RTTI_REF(simple_class_rtti, base_array)}, - {RTTI_SIGNATURE, 0, 0, RTTI_REF(simple_class_rtti, type_info[0]), RTTI_REF(simple_class_rtti, object_hierarchy), RTTI_REF(simple_class_rtti, object_locator)} + {1, 0, 0, RTTI_REF(simple_class_rtti, type_info[0]), RTTI_REF(simple_class_rtti, object_hierarchy), RTTI_REF(simple_class_rtti, object_locator)} }, child_class_rtti = { { {NULL, NULL, "simple_class"}, {NULL, NULL, "child_class"} }, { {RTTI_REF(child_class_rtti, type_info[1]), 0, {4, -1, 0}, 0}, {RTTI_REF(child_class_rtti, type_info[0]), 0, {8, -1, 0}, 0} }, { {RTTI_REF(child_class_rtti, base_descriptor[0]), RTTI_REF(child_class_rtti, base_descriptor[1])} }, {0, 0, 2, RTTI_REF(child_class_rtti, base_array)}, - {RTTI_SIGNATURE, 0, 0, RTTI_REF(child_class_rtti, type_info[1]), RTTI_REF(child_class_rtti, object_hierarchy), RTTI_REF(child_class_rtti, object_locator)} + {1, 0, 0, RTTI_REF(child_class_rtti, type_info[1]), RTTI_REF(child_class_rtti, object_hierarchy), RTTI_REF(child_class_rtti, object_locator)} }; + static struct rtti_data simple_class_sig0_rtti, child_class_sig0_rtti; + void *simple_class_vtbl[2] = {&simple_class_rtti.object_locator}; void *simple_class = &simple_class_vtbl[1]; void *child_class_vtbl[2] = {&child_class_rtti.object_locator}; void *child_class = &child_class_vtbl[1]; + void *simple_class_sig0_vtbl[2] = {&simple_class_sig0_rtti.object_locator}; + void *simple_class_sig0 = &simple_class_sig0_vtbl[1]; + void *child_class_sig0_vtbl[2] = {&child_class_sig0_rtti.object_locator}; + void *child_class_sig0 = &child_class_sig0_vtbl[1]; static const char* e_name = "name"; type_info *ti,*bti; exception e,b; void *casted; BOOL old_signature; +#ifdef __x86_64__ + char *base = (char*)GetModuleHandleW(NULL); +#endif if (bAncientVersion || !p__RTCastToVoid || !p__RTtypeid || !pexception_ctor || !pbad_typeid_ctor @@ -922,7 +931,7 @@ static void test_rtti(void) call_func2(pbad_typeid_ctor, &b, e_name); obj_locator = get_obj_locator(&e); - if(obj_locator->signature!=RTTI_SIGNATURE && sizeof(void*)>sizeof(int)) + if(obj_locator->signature!=1 && sizeof(void*)>sizeof(int)) old_signature = TRUE; else old_signature = FALSE; @@ -949,6 +958,47 @@ static void test_rtti(void) call_func1(pexception_dtor, &e); call_func1(pbad_typeid_dtor, &b); + memcpy(&simple_class_sig0_rtti, &simple_class_rtti, sizeof(struct rtti_data)); + simple_class_sig0_rtti.object_locator.signature = 0; + simple_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); + simple_class_sig0_rtti.base_array.bases[0] = RTTI_REF_SIG0(simple_class_sig0_rtti, base_descriptor[0], base); + simple_class_sig0_rtti.object_hierarchy.base_classes = RTTI_REF_SIG0(simple_class_sig0_rtti, base_array, base); + simple_class_sig0_rtti.object_locator.type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); + simple_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(simple_class_sig0_rtti, object_hierarchy, base); + + memcpy(&child_class_sig0_rtti, &child_class_rtti, sizeof(struct rtti_data)); + child_class_sig0_rtti.object_locator.signature = 0; + child_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[1], base); + child_class_sig0_rtti.base_descriptor[1].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[0], base); + child_class_sig0_rtti.base_array.bases[0] = RTTI_REF_SIG0(child_class_sig0_rtti, base_descriptor[0], base); + child_class_sig0_rtti.base_array.bases[1] = RTTI_REF_SIG0(child_class_sig0_rtti, base_descriptor[1], base); + child_class_sig0_rtti.object_hierarchy.base_classes = RTTI_REF_SIG0(child_class_sig0_rtti, base_array, base); + child_class_sig0_rtti.object_locator.type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[1], base); + child_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(child_class_sig0_rtti, object_hierarchy, base); + + ti = p__RTtypeid(&simple_class_sig0); + ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"), + "incorrect rtti data\n"); + + casted = p__RTCastToVoid(&simple_class_sig0); + ok (casted == (void*)&simple_class_sig0, "failed cast to void\n"); + + ti = p__RTtypeid(&child_class_sig0); + ok (ti && ti->mangled && !strcmp(ti->mangled, "child_class"), + "incorrect rtti data\n"); + + casted = p__RTCastToVoid(&child_class_sig0); + ok (casted == (void*)&child_class_sig0, "failed cast to void\n"); + + casted = p__RTDynamicCast(&child_class_sig0, 0, NULL, simple_class_sig0_rtti.type_info, 0); + if(casted) + { + ok (casted == (char*)&child_class_sig0+8, "failed cast to simple_class (%p %p)\n", casted, &child_class_sig0); + } + + casted = p__RTDynamicCast(&child_class_sig0, 0, &child_class_sig0_rtti.type_info[0], &child_class_sig0_rtti.type_info[1], 0); + ok(casted == (char*)&child_class_sig0+4, "failed cast to child class (%p %p)\n", casted, &child_class_sig0); + if(old_signature) { skip("signature==1 is not supported\n"); return;

1 0

Alexandre Julliard : server: Don' t trigger repaints on position changes for layered windows.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 84fd7de0f7c0146b73f7b8d9cd364c9e6a7f3096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fd7de0f7c0146b73f7b8d9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:47:03 2012 +0200 server: Don't trigger repaints on position changes for layered windows. --- server/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index 47b94e2..a5a8853 100644 --- a/server/window.c +++ b/server/window.c @@ -2136,6 +2136,9 @@ DECL_HANDLER(set_window_pos) if (previous == win) flags |= SWP_NOZORDER; /* nothing to do */ } + /* windows that use UpdateLayeredWindow don't trigger repaints */ + if ((win->ex_style & WS_EX_LAYERED) && !win->is_layered) flags |= SWP_NOREDRAW; + /* window rectangle must be ordered properly */ if (req->window.right < req->window.left || req->window.bottom < req->window.top) {

1 0

Jacek Caban : oaidl.idl: Added REFVARIANT declaration.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 22bcb1a7f437d2e26a1bcd6a8cc7420b85bf78c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bcb1a7f437d2e26a1bcd6a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 09:37:59 2012 +0200 oaidl.idl: Added REFVARIANT declaration. --- include/oaidl.idl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/oaidl.idl b/include/oaidl.idl index 0dc4c05..37da734 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -230,6 +230,17 @@ typedef VARIANT *LPVARIANT; typedef VARIANT VARIANTARG; typedef VARIANTARG *LPVARIANTARG; +cpp_quote("#if 0") +typedef const VARIANT *REFVARIANT; +cpp_quote("#elif !defined(_REFVARIANT_DEFINED)") +cpp_quote("#define _REFVARIANT_DEFINED") +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFVARIANT const VARIANT &") +cpp_quote("#else") +cpp_quote("#define REFVARIANT const VARIANT *__MIDL_CONST") +cpp_quote("#endif") +cpp_quote("#endif") + struct _wireBRECORD { ULONG fFlags; ULONG clSize;

1 0

Henri Verbeet : wined3d: wined3d_device_set_base_vertex_index() never fails .
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: b8feef883375d973b48d31b0f421619113d0749f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8feef883375d973b48d31b0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:16 2012 +0200 wined3d: wined3d_device_set_base_vertex_index() never fails. --- dlls/wined3d/device.c | 16 +--------------- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0ce4c4..e5cf69b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2260,25 +2260,11 @@ struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined return device->stateBlock->state.index_buffer; } -/* Method to offer d3d9 a simple way to set the base vertex index without messing with the index buffer */ -HRESULT CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index) +void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index) { TRACE("device %p, base_index %d.\n", device, base_index); - if (device->updateStateBlock->state.base_vertex_index == base_index) - { - TRACE("Application is setting the old value over, nothing to do\n"); - return WINED3D_OK; - } - device->updateStateBlock->state.base_vertex_index = base_index; - - if (device->isRecordingState) - { - TRACE("Recording... not performing anything\n"); - return WINED3D_OK; - } - return WINED3D_OK; } INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15aeb57..478abe0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2189,7 +2189,7 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); -HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); +void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device,

1 0

Alexandre Julliard : user32/tests: Add some tests for UpdateLayeredWindow.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: b9fa73a798a6f8735a91d993b1eea58defbf76fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fa73a798a6f8735a91d993b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:57 2012 +0200 user32/tests: Add some tests for UpdateLayeredWindow. --- dlls/user32/tests/msg.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 11830ad..0b63799 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1721,6 +1721,7 @@ static BOOL (WINAPI *pTrackMouseEvent)(TRACKMOUSEEVENT*); static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); /* kernel32 functions */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); @@ -1744,6 +1745,7 @@ static void init_procs(void) GET_PROC(user32, UnhookWinEvent) GET_PROC(user32, GetMonitorInfoA) GET_PROC(user32, MonitorFromPoint) + GET_PROC(user32, UpdateLayeredWindow) GET_PROC(kernel32, GetCPInfoExA) @@ -13772,6 +13774,131 @@ todo_wine CloseHandle(hthread); } +static const struct message WmSetLayeredStyle[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { 0 } +}; + +static const struct message WmSetLayeredStyle2[] = { + { WM_STYLECHANGING, sent }, + { WM_STYLECHANGED, sent }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional|wparam|defwinproc, 1 }, + { WM_WINDOWPOSCHANGED, sent|optional|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_MOVE, sent|optional|defwinproc|wparam, 0 }, + { WM_SIZE, sent|optional|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; + +static void test_layered_window(void) +{ + HWND hwnd; + HDC hdc; + HBITMAP bmp; + BOOL ret; + SIZE size; + POINT pos, src; + RECT rect, client; + + if (!pUpdateLayeredWindow) + { + win_skip( "UpdateLayeredWindow not supported\n" ); + return; + } + + hdc = CreateCompatibleDC( 0 ); + bmp = CreateCompatibleBitmap( hdc, 300, 300 ); + SelectObject( hdc, bmp ); + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_CAPTION | WS_THICKFRAME | WS_SYSMENU, + 100, 100, 300, 300, 0, 0, 0, NULL); + ok( hwnd != 0, "failed to create window\n" ); + ShowWindow( hwnd, SW_SHOWNORMAL ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + GetWindowRect( hwnd, &rect ); + GetClientRect( hwnd, &client ); + ok( client.right < rect.right - rect.left, "wrong client area\n" ); + ok( client.bottom < rect.bottom - rect.top, "wrong client area\n" ); + + src.x = src.y = 0; + pos.x = pos.y = 300; + size.cx = size.cy = 250; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + ok_sequence( WmSetLayeredStyle, "WmSetLayeredStyle", FALSE ); + + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 300 && rect.top == 300 && rect.right == 550 && rect.bottom == 550, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( rect.right == client.right - 50 && rect.bottom == client.bottom - 50, + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + size.cx = 150; + pos.y = 200; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 300 && rect.top == 200 && rect.right == 450 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( rect.right == client.right - 150 && rect.bottom == client.bottom - 50, + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + SetWindowLong( hwnd, GWL_STYLE, + GetWindowLong(hwnd, GWL_STYLE) & ~(WS_CAPTION | WS_THICKFRAME | WS_SYSMENU) ); + ok_sequence( WmSetLayeredStyle2, "WmSetLayeredStyle2", FALSE ); + + size.cx = 200; + pos.x = 200; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( ret, "UpdateLayeredWindow failed err %u\n", GetLastError() ); + ok_sequence( WmEmptySeq, "UpdateLayeredWindow", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 200 && rect.bottom == 250) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + size.cx = 0; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(ERROR_MR_MID_NOT_FOUND) /* win7 */, + "wrong error %u\n", GetLastError() ); + size.cx = 1; + size.cy = -1; + ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED ); + ok_sequence( WmSetLayeredStyle, "WmSetLayeredStyle", FALSE ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 400 && rect.bottom == 450, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 200 && rect.bottom == 250) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + DestroyWindow( hwnd ); + DeleteDC( hdc ); + DeleteObject( bmp ); +} + START_TEST(msg) { char **test_argv; @@ -13884,6 +14011,7 @@ START_TEST(msg) test_clipboard_viewers(); test_keyflags(); test_hotkey(); + test_layered_window(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Jacek Caban : mshtml: Added support for event object in HTMLElement:: fireEvent.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 3de3d07054d586d60be9d36f6c5725c3f28134fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de3d07054d586d60be9d36f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:28:09 2012 +0200 mshtml: Added support for event object in HTMLElement::fireEvent. --- dlls/mshtml/htmlevent.c | 134 +++++++++++++++++++++++++++++++++------------- 1 files changed, 96 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index eecff1c..6f1260a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -788,6 +788,11 @@ static const IHTMLEventObjVtbl HTMLEventObjVtbl = { HTMLEventObj_get_srcFilter }; +static inline HTMLEventObj *unsafe_impl_from_IHTMLEventObj(IHTMLEventObj *iface) +{ + return iface->lpVtbl == &HTMLEventObjVtbl ? impl_from_IHTMLEventObj(iface) : NULL; +} + static const tid_t HTMLEventObj_iface_tids[] = { IHTMLEventObj_tid, 0 @@ -800,7 +805,7 @@ static dispex_static_data_t HTMLEventObj_dispex = { HTMLEventObj_iface_tids }; -static HTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEvent *nsevent) +static HTMLEventObj *create_event(void) { HTMLEventObj *ret; @@ -810,39 +815,43 @@ static HTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEven ret->IHTMLEventObj_iface.lpVtbl = &HTMLEventObjVtbl; ret->ref = 1; - ret->type = eid != EVENTID_LAST ? event_info+eid : NULL; - ret->nsevent = nsevent; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLEventObj_iface, &HTMLEventObj_dispex); + + return ret; +} + +static HRESULT set_event_info(HTMLEventObj *event, HTMLDOMNode *target, eventid_t eid, nsIDOMEvent *nsevent) +{ + event->type = event_info+eid; + event->nsevent = nsevent; + if(nsevent) { nsIDOMEvent_AddRef(nsevent); - }else if(eid != EVENTID_LAST && event_types[event_info[eid].type]) { + }else if(event_types[event_info[eid].type]) { nsAString type_str; nsresult nsres; nsAString_InitDepend(&type_str, event_types[event_info[eid].type]); - nsres = nsIDOMHTMLDocument_CreateEvent(target->doc->nsdoc, &type_str, &ret->nsevent); + nsres = nsIDOMHTMLDocument_CreateEvent(target->doc->nsdoc, &type_str, &event->nsevent); nsAString_Finish(&type_str); if(NS_FAILED(nsres)) { ERR("Could not create event: %08x\n", nsres); - IHTMLEventObj_Release(&ret->IHTMLEventObj_iface); - return NULL; + return E_FAIL; } } - ret->target = target; + event->target = target; if(target) IHTMLDOMNode_AddRef(&target->IHTMLDOMNode_iface); - - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLEventObj_iface, &HTMLEventObj_dispex); - - return ret; + return S_OK; } HRESULT create_event_obj(IHTMLEventObj **ret) { HTMLEventObj *event; - event = create_event(NULL, EVENTID_LAST, NULL); + event = create_event(); if(!event) return E_OUTOFMEMORY; @@ -1021,9 +1030,8 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } } -void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent) +static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, nsIDOMNode *target) { - HTMLEventObj *event_obj = NULL; IHTMLEventObj *prev_event; nsIDOMNode *parent, *nsnode; BOOL prevent_default = FALSE; @@ -1037,17 +1045,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode window = doc->window; prev_event = window->event; - if(set_event) { - hres = get_node(doc, target, TRUE, &node); - if(FAILED(hres)) - return; - - event_obj = create_event(node, eid, nsevent); - node_release(node); - window->event = &event_obj->IHTMLEventObj_iface; - }else { - window->event = NULL; - } + window->event = &event_obj->IHTMLEventObj_iface; nsIDOMNode_GetNodeType(target, &node_type); nsnode = target; @@ -1111,8 +1109,6 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(event_obj && event_obj->prevent_default) prevent_default = TRUE; window->event = prev_event; - if(event_obj) - IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(!prevent_default && (event_info[eid].flags & EVENT_HASDEFAULTHANDLERS)) { nsIDOMNode_AddRef(target); @@ -1125,7 +1121,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(node) { if(node->vtbl->handle_event) - hres = node->vtbl->handle_event(node, eid, nsevent, &prevent_default); + hres = node->vtbl->handle_event(node, eid, event_obj ? event_obj->nsevent : NULL, &prevent_default); node_release(node); if(FAILED(hres) || prevent_default || (event_obj && event_obj->cancel_bubble)) break; @@ -1143,15 +1139,46 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode nsIDOMNode_Release(nsnode); } - if(prevent_default && nsevent) { + if(prevent_default && event_obj && event_obj->nsevent) { TRACE("calling PreventDefault\n"); - nsIDOMEvent_PreventDefault(nsevent); + nsIDOMEvent_PreventDefault(event_obj->nsevent); } } -HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_obj, VARIANT_BOOL *cancelled) +void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent) { + HTMLEventObj *event_obj = NULL; + HTMLDOMNode *node; + HRESULT hres; + + if(set_event) { + hres = get_node(doc, target, TRUE, &node); + if(FAILED(hres)) + return; + + event_obj = create_event(); + node_release(node); + if(!event_obj) + return; + + hres = set_event_info(event_obj, node, eid, nsevent); + if(FAILED(hres)) { + IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); + return; + } + } + + fire_event_obj(doc, eid, event_obj, target); + + if(event_obj) + IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); +} + +HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) +{ + HTMLEventObj *event_obj = NULL; eventid_t eid; + HRESULT hres; eid = attr_to_eid(event_name); if(eid == EVENTID_LAST) { @@ -1159,15 +1186,46 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even return E_INVALIDARG; } - if(event_obj && V_VT(event_obj) != VT_EMPTY && V_VT(event_obj) != VT_ERROR) - FIXME("event_obj not implemented\n"); + if(event_var && V_VT(event_var) != VT_EMPTY && V_VT(event_var) != VT_ERROR) { + if(V_VT(event_var) != VT_DISPATCH) { + FIXME("event_var %s not supported\n", debugstr_variant(event_var)); + return E_NOTIMPL; + } - if(!(event_info[eid].flags & EVENT_DEFAULTLISTENER)) { - FIXME("not EVENT_DEFAULTEVENTHANDLER\n"); - return E_NOTIMPL; + if(V_DISPATCH(event_var)) { + IHTMLEventObj *event_iface; + + hres = IDispatch_QueryInterface(V_DISPATCH(event_var), &IID_IHTMLEventObj, (void**)&event_iface); + if(FAILED(hres)) { + FIXME("No IHTMLEventObj iface\n"); + return hres; + } + + event_obj = unsafe_impl_from_IHTMLEventObj(event_iface); + if(!event_obj) { + ERR("Not our IHTMLEventObj?\n"); + IHTMLEventObj_Release(event_iface); + return E_FAIL; + } + } } - fire_event(node->doc, eid, TRUE, node->nsnode, NULL); + if(event_obj) { + hres = set_event_info(event_obj, node, eid, NULL); + if(SUCCEEDED(hres)) + fire_event_obj(node->doc, eid, event_obj, node->nsnode); + + IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); + if(FAILED(hres)) + return hres; + }else { + if(!(event_info[eid].flags & EVENT_DEFAULTLISTENER)) { + FIXME("not EVENT_DEFAULTEVENTHANDLER\n"); + return E_NOTIMPL; + } + + fire_event(node->doc, eid, TRUE, node->nsnode, NULL); + } *cancelled = VARIANT_TRUE; /* FIXME */ return S_OK;

1 0

Jacek Caban : mshtml: Added IHTMLDocument4::fireEvent implementation.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: 05dc7eac8d21297f6eed0508a9e38b9d990a50ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=05dc7eac8d21297f6eed0508a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:29:17 2012 +0200 mshtml: Added IHTMLDocument4::fireEvent implementation. --- dlls/mshtml/htmldoc3.c | 6 ++++-- dlls/mshtml/htmlevent.c | 11 ++++------- dlls/mshtml/tests/events.html | 29 +++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 6256450..f34f0a2 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -777,8 +777,10 @@ static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEv VARIANT *pvarEventObject, VARIANT_BOOL *pfCanceled) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCanceled); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCanceled); + + return dispatch_event(&This->doc_node->node, bstrEventName, pvarEventObject, pfCanceled); } static HRESULT WINAPI HTMLDocument4_createRenderStyle(IHTMLDocument4 *iface, BSTR v, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6f1260a..12ff2ff 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -364,13 +364,10 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle TRACE("(%p)->(%p)\n", This, p); - if(!This->target) { - *p = NULL; - return S_OK; - } - - return IHTMLDOMNode_QueryInterface(&This->target->IHTMLDOMNode_iface, &IID_IHTMLElement, - (void**)p); + *p = NULL; + if(This->target) + IHTMLDOMNode_QueryInterface(&This->target->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index fbac741..ad9db3f 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -20,6 +20,16 @@ function ondataavailable_test() { ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); } + function ondataavailableDocHandler() { + b = true; + ok(window.event === evobj, "window.event != evobj"); + + ok(evobj.srcElement === null, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.fromElement === null, "evobj.srcElement = " + evobj.fromElement); + ok(evobj.toElement === null, "evobj.srcElement = " + evobj.toElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); + } + div.attachEvent("ondataavailable", ondataavailableHandler); evobj = document.createEventObject(); @@ -33,6 +43,25 @@ function ondataavailable_test() { ok(evobj.srcElement === div, "evobj.srcElement = " + evobj.srcElement); ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); + + div.detachEvent("ondataavailable", ondataavailableHandler); + + b = false; + div.fireEvent("ondataavailable", evobj); + ok(!b, "ondataavailable handler called?"); + + ok(evobj.srcElement === div, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); + + document.attachEvent("ondataavailable", ondataavailableDocHandler); + + evobj = document.createEventObject(); + + document.fireEvent("ondataavailable", evobj); + ok(b, "ondataavailable handler not called?"); + + ok(evobj.srcElement === null, "evobj.srcElement = " + evobj.srcElement); + ok(evobj.type === "dataavailable", "evobj.type = " + evobj.type); } function runTests() {

1 0

Jacek Caban : mshtml: Try using IWinInetHttpInfo if OnResponse was not called.
by Alexandre Julliard Sept. 13, 2012

Sept. 13, 2012

Module: wine Branch: master Commit: a9829338694b27c893109070d0be8f4462a58961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9829338694b27c893109070d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 12:29:30 2012 +0200 mshtml: Try using IWinInetHttpInfo if OnResponse was not called. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/navigate.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index eef6053..0053e75 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -87,6 +87,7 @@ struct nsChannelBSC { nsISupports *nscontext; BOOL is_js; BOOL is_doc_channel; + BOOL response_processed; nsProtocolStream *nsstream; }; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1046356..4bed605 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -754,6 +754,33 @@ static HRESULT process_response_headers(nsChannelBSC *This, const WCHAR *headers return S_OK; } +static void query_http_info(nsChannelBSC *This, IWinInetHttpInfo *wininet_info) +{ + const WCHAR *ptr; + DWORD len = 0; + WCHAR *buf; + + IWinInetHttpInfo_QueryInfo(wininet_info, HTTP_QUERY_RAW_HEADERS_CRLF, NULL, &len, NULL, NULL); + if(!len) + return; + + buf = heap_alloc(len); + if(!buf) + return; + + IWinInetHttpInfo_QueryInfo(wininet_info, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &len, NULL, NULL); + if(!len) + return; + + ptr = strchrW(buf, '\r'); + if(ptr && ptr[1] == '\n') { + ptr += 2; + process_response_headers(This, ptr); + } + + heap_free(buf); +} + HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; @@ -1111,6 +1138,19 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) nsresult nsres; HRESULT hres; + if(!This->response_processed) { + IWinInetHttpInfo *wininet_info; + + This->response_processed = TRUE; + if(This->bsc.binding) { + hres = IBinding_QueryInterface(This->bsc.binding, &IID_IWinInetHttpInfo, (void**)&wininet_info); + if(SUCCEEDED(hres)) { + query_http_info(This, wininet_info); + IWinInetHttpInfo_Release(wininet_info); + } + } + } + if(!This->nslistener) { BYTE buf[1024]; @@ -1601,6 +1641,7 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); HRESULT hres; + This->response_processed = TRUE; This->nschannel->response_status = response_code; if(response_headers) {

1 0