October 2017 - Wine-Commits

Francois Gouget : testbot: Better deal with $MaxVMsWhenIdle > $MaxActiveVMs.
by Alexandre Julliard Oct. 23, 2017

Oct. 23, 2017

Module: tools Branch: master Commit: 36b563106282ddf81a82cd62e3b74d712323916f URL: http://source.winehq.org/git/tools.git/?a=commit;h=36b563106282ddf81a82cd62… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 20 16:15:17 2017 +0200 testbot: Better deal with $MaxVMsWhenIdle > $MaxActiveVMs. Make sure we limit the number of running VMs to $MaxActiveVMs even if we have more idle VMs ready, such as when $MaxVMsWhenIdle > $MaxActiveVMs. For instance this allows preparing two or three VMs for future jobs, while still running the tasks one by one once there is a job to run. Also prevent the premature powering off of the extra idle VMs that are going to be used next (like we do for VMs that will be needed for the current jobs next steps). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index de639c7..3a3e517 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -457,8 +457,11 @@ reverting too many VMs at once. =item * Once there are no jobs to run anymore the scheduler can prepare up to -$MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. This can be -set to 0 to minimize the TestBot resource usage when idle. +$MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. +This can be set to 0 to minimize the TestBot resource usage when idle. +This can also be set to a value greater than $MaxActiveVMs. Then only +$MaxActiveVMs tasks will be run simultaneously but the extra idle VMs will be +kept on standby so they are ready when their turn comes. =cut @@ -546,23 +549,28 @@ sub ScheduleOnHost($$$) next if (!$HostVMs->ItemExists($VMKey) || exists $VMsToRevert{$VMKey}); my $VMStatus = $VM->Status; - if ($VMStatus eq "idle" && - ($RevertingCount == 0 || $MaxRevertsWhileRunningVMs > 0)) + if ($VMStatus eq "idle") { + # Even if we cannot start the task right away this VM is not a + # candidate for shutdown since it will be needed next. $IdleVMs{$VMKey} = 0; - $IdleCount--; - - my $ErrMessage = $Task->Run($Step); - return $ErrMessage if (defined $ErrMessage); - $Job->UpdateStatus(); - $RunningCount++; - $PrepareNextStep = 1; + if ($RunningCount < $MaxActiveVMs and + ($RevertingCount == 0 || $RevertingCount < $MaxRevertsWhileRunningVMs)) + { + my $ErrMessage = $Task->Run($Step); + return $ErrMessage if (defined $ErrMessage); + + $Job->UpdateStatus(); + $IdleCount--; + $RunningCount++; + $PrepareNextStep = 1; + } } elsif ($VMStatus eq "sleeping" and $IdleVMs{$VMKey}) { # It's not running jobs yet but soon will be - # so it's not a candidate for shutdown. + # so it's not a candidate for shutdown or revert. $IdleVMs{$VMKey} = 0; $IdleCount--; $SleepingCount++; @@ -587,7 +595,7 @@ sub ScheduleOnHost($$$) my $VM = $Task->VM; my $VMKey = $VM->GetKey(); push @VMsNext, $VMKey; - # Not a candidate for shutdown + # If idle already this is not a candidate for shutdown $IdleVMs{$VMKey} = 0; } } @@ -667,11 +675,11 @@ sub ScheduleOnHost($$$) $ActiveCount++ if ($VM->Status eq "off"); } - # Prepare some VMs for the current jobs next step + # Prepare some VMs for the next step of the current jobs foreach my $VMKey (@VMsNext) { last if ($RevertingCount == $MaxReverts); - last if ($ActiveCount == $MaxActiveVMs); + last if ($ActiveCount >= $MaxActiveVMs); my $VM = $HostVMs->GetItem($VMKey); next if ($VM->Status ne "off");

1 0

Francois Gouget : testbot: Deprecate Task::ChildPid in favor of VM:: ChildPid.
by Alexandre Julliard Oct. 23, 2017

Oct. 23, 2017

Module: tools Branch: master Commit: 2ae3d771548291501a870e9e6010010be168cb17 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ae3d771548291501a870e9e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 20 16:17:02 2017 +0200 testbot: Deprecate Task::ChildPid in favor of VM::ChildPid. This way the pid of the process working on a VM is always stored in the same place which makes it easier to check if the VM is still 'busy' when validating its status field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 38 +++++----- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/lib/WineTestBot/Tasks.pm | 145 ++++++++++++++++----------------------- testbot/lib/WineTestBot/VMs.pm | 28 ++++++-- 6 files changed, 104 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2ae3d771548291501a87…

1 0

Francois Gouget : testbot: Remove StepsTasks::ChildPid. It is unused.
by Alexandre Julliard Oct. 23, 2017

Oct. 23, 2017

Module: tools Branch: master Commit: a41641e25580a1e68e82894d0c78b02eb97f7965 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a41641e25580a1e68e82894d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 20 16:17:48 2017 +0200 testbot: Remove StepsTasks::ChildPid. It is unused. And with Task::ChildPid being deprecated it is not relevant anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/StepsTasks.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 8176c76..73be78c 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -109,7 +109,6 @@ BEGIN CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), @@ -152,7 +151,6 @@ sub _initialize($$) } $StepTask->FileType($Step->FileType); $StepTask->CmdLineArg($Task->CmdLineArg); - $StepTask->ChildPid($Task->ChildPid); $StepTask->Started($Task->Started); $StepTask->Ended($Task->Ended); $StepTask->TestFailures($Task->TestFailures);

1 0

Jacek Caban : mshtml: Don' t use fire_event to dispatch script readystatechange event.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: fdf21a53a279979a2e41750c0f48b253ff465236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf21a53a279979a2e41750c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:10:30 2017 +0200 mshtml: Don't use fire_event to dispatch script readystatechange event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 18 +++++++++++++++--- dlls/mshtml/tests/events.html | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index da0aa54..3b4fcc5 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -724,6 +724,19 @@ static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) return ret; } +static void dispatch_script_readystatechange_event(HTMLScriptElement *script) +{ + DOMEvent *event; + HRESULT hres; + + hres = create_document_event(script->element.node.doc, EVENTID_READYSTATECHANGE, &event); + if(FAILED(hres)) + return; + + fire_event_obj(&script->element.node.event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); +} + typedef struct { task_t header; HTMLScriptElement *elem; @@ -737,7 +750,7 @@ static void fire_readystatechange_proc(task_t *_task) return; task->elem->pending_readystatechange_event = FALSE; - fire_event(task->elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, &task->elem->element.node.event_target, NULL); + dispatch_script_readystatechange_event(task->elem); } static void fire_readystatechange_task_destr(task_t *_task) @@ -772,8 +785,7 @@ static void set_script_elem_readystate(HTMLScriptElement *script_elem, READYSTAT script_elem->pending_readystatechange_event = TRUE; }else { script_elem->pending_readystatechange_event = FALSE; - fire_event(script_elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, - &script_elem->element.node.event_target, NULL); + dispatch_script_readystatechange_event(script_elem); } } } diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 9e27491..4172e30 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -123,6 +123,7 @@ function test_insert_script() { var readystatechange_log = ""; e.onreadystatechange = function() { + ok(window.event.srcElement === e, "srcElement != e"); readystatechange_log += "," + e.readyState; ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); if(e.readyState === "complete") {

1 0

Jacek Caban : mshtml: Don't use fire_event to dispatch help event.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 2a771127cda45a3ea50c98072a8f5c831168d9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a771127cda45a3ea50c98072… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:10:04 2017 +0200 mshtml: Don't use fire_event to dispatch help event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8aab4c4..9f231f5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5188,10 +5188,17 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve nsIDOMKeyEvent_GetKeyCode(key_event, &code); - switch(code) { - case VK_F1: /* DOM_VK_F1 */ + if(code == VK_F1 /* DOM_VK_F1 */) { + DOMEvent *help_event; + HRESULT hres; + TRACE("F1 pressed\n"); - fire_event(This->node.doc, EVENTID_HELP, TRUE, &This->node.event_target, NULL); + + hres = create_document_event(This->node.doc, EVENTID_HELP, &help_event); + if(SUCCEEDED(hres)) { + fire_event_obj(&This->node.event_target, help_event); + IDOMEvent_Release(&help_event->IDOMEvent_iface); + } *prevent_default = TRUE; }

1 0

Jacek Caban : mshtml: Don't use fire_event in postMessage.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 9130720e85a874a1b3881b25a02f3410ef13ca7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9130720e85a874a1b3881b25a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:52 2017 +0200 mshtml: Don't use fire_event in postMessage. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8167694..6533bb9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1132,7 +1132,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM return S_OK; } -static HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEvent **ret_event) +HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEvent **ret_event) { nsIDOMEvent *nsevent; DOMEvent *event; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1d99604..d8717d5 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -88,6 +88,7 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; void fire_event_obj(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; +HRESULT create_document_event(HTMLDocumentNode*,eventid_t,DOMEvent**) DECLSPEC_HIDDEN; HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index df181d6..5dc50cc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2161,6 +2161,8 @@ static HRESULT WINAPI HTMLWindow6_get_maxConnectionsPerServer(IHTMLWindow6 *ifac static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VARIANT targetOrigin) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); + DOMEvent *event; + HRESULT hres; FIXME("(%p)->(%s %s) semi-stub\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); @@ -2169,7 +2171,12 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR return E_FAIL; } - fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, &This->inner_window->event_target, NULL); + hres = create_document_event(This->inner_window->doc, EVENTID_MESSAGE, &event); + if(FAILED(hres)) + return hres; + + fire_event_obj(&This->inner_window->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); return S_OK; }

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRegion deserialization.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: aef2f0799f09595f3458d3495e85bba0c9059865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef2f0799f09595f3458d3495… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:45:40 2017 +0300 gdiplus/metafile: Implement EmfPlusRegion deserialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 25 ++++++++ dlls/gdiplus/metafile.c | 138 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/region.c | 24 ------- dlls/gdiplus/tests/metafile.c | 2 +- 4 files changed, 164 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f39838e..ca2c022 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -396,6 +396,7 @@ struct emfplus_object { GpBrush *brush; GpPen *pen; GpPath *path; + GpRegion *region; GpImage *image; GpFont *font; GpImageAttributes *image_attributes; @@ -561,6 +562,30 @@ struct GpRegion{ region_element node; }; +struct memory_buffer +{ + const BYTE *buffer; + INT size, pos; +}; + +static inline void init_memory_buffer(struct memory_buffer *mbuf, const BYTE *buffer, INT size) +{ + mbuf->buffer = buffer; + mbuf->size = size; + mbuf->pos = 0; +} + +static inline const void *buffer_read(struct memory_buffer *mbuf, INT size) +{ + if (mbuf->size - mbuf->pos >= size) + { + const void *data = mbuf->buffer + mbuf->pos; + mbuf->pos += size; + return data; + } + return NULL; +} + typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f18411b..7289ea5 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -265,6 +265,12 @@ typedef struct EmfPlusPath BYTE data[1]; } EmfPlusPath; +typedef struct EmfPlusRegionNodePath +{ + DWORD RegionNodePathLength; + EmfPlusPath RegionNodePath; +} EmfPlusRegionNodePath; + typedef struct EmfPlusRegion { DWORD Version; @@ -429,6 +435,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypePath: GdipDeletePath(object->u.path); break; + case ObjectTypeRegion: + GdipDeleteRegion(object->u.region); + break; case ObjectTypeImage: GdipDisposeImage(object->u.image); break; @@ -1685,6 +1694,132 @@ static GpStatus metafile_deserialize_path(const BYTE *record_data, UINT data_siz return Ok; } +static GpStatus metafile_read_region_node(struct memory_buffer *mbuf, GpRegion *region, region_element *node, UINT *count) +{ + const DWORD *type; + GpStatus status; + + type = buffer_read(mbuf, sizeof(*type)); + if (!type) return Ok; + + node->type = *type; + + switch (node->type) + { + case CombineModeReplace: + case CombineModeIntersect: + case CombineModeUnion: + case CombineModeXor: + case CombineModeExclude: + case CombineModeComplement: + { + region_element *left, *right; + + left = heap_alloc_zero(sizeof(*left)); + if (!left) + return OutOfMemory; + + right = heap_alloc_zero(sizeof(*right)); + if (!right) + { + heap_free(left); + return OutOfMemory; + } + + status = metafile_read_region_node(mbuf, region, left, count); + if (status == Ok) + { + status = metafile_read_region_node(mbuf, region, right, count); + if (status == Ok) + { + node->elementdata.combine.left = left; + node->elementdata.combine.right = right; + region->num_children += 2; + return Ok; + } + } + + heap_free(left); + heap_free(right); + return status; + } + case RegionDataRect: + { + const EmfPlusRectF *rect; + + rect = buffer_read(mbuf, sizeof(*rect)); + if (!rect) + return InvalidParameter; + + memcpy(&node->elementdata.rect, rect, sizeof(*rect)); + *count += 1; + return Ok; + } + case RegionDataPath: + { + const BYTE *path_data; + const UINT *data_size; + GpPath *path; + + data_size = buffer_read(mbuf, FIELD_OFFSET(EmfPlusRegionNodePath, RegionNodePath)); + if (!data_size) + return InvalidParameter; + + path_data = buffer_read(mbuf, *data_size); + if (!path_data) + return InvalidParameter; + + status = metafile_deserialize_path(path_data, *data_size, &path); + if (status == Ok) + { + node->elementdata.path = path; + *count += 1; + } + return Ok; + } + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + *count += 1; + return Ok; + default: + FIXME("element type %#x is not supported\n", *type); + break; + } + + return InvalidParameter; +} + +static GpStatus metafile_deserialize_region(const BYTE *record_data, UINT data_size, GpRegion **region) +{ + struct memory_buffer mbuf; + GpStatus status; + UINT count; + + *region = NULL; + + init_memory_buffer(&mbuf, record_data, data_size); + + if (!buffer_read(&mbuf, FIELD_OFFSET(EmfPlusRegion, RegionNode))) + return InvalidParameter; + + status = GdipCreateRegion(region); + if (status != Ok) + return status; + + count = 0; + status = metafile_read_region_node(&mbuf, *region, &(*region)->node, &count); + if (status == Ok && !count) + status = InvalidParameter; + + if (status != Ok) + { + GdipDeleteRegion(*region); + *region = NULL; + } + + return status; +} + static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush) { static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData); @@ -1935,6 +2070,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypePath: status = metafile_deserialize_path(record_data, data_size, (GpPath **)&object); break; + case ObjectTypeRegion: + status = metafile_deserialize_region(record_data, data_size, (GpRegion **)&object); + break; case ObjectTypeImage: status = metafile_deserialize_image(record_data, data_size, (GpImage **)&object); break; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 8a2ca6b..8eb3ff3 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -76,12 +76,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define FLAGS_INTPATH 0x4000 -struct memory_buffer -{ - const BYTE *buffer; - INT size, pos; -}; - struct region_header { DWORD magic; @@ -778,24 +772,6 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, return Ok; } -static inline void init_memory_buffer(struct memory_buffer *mbuf, const BYTE *buffer, INT size) -{ - mbuf->buffer = buffer; - mbuf->size = size; - mbuf->pos = 0; -} - -static inline const void *buffer_read(struct memory_buffer *mbuf, INT size) -{ - if (mbuf->size - mbuf->pos >= size) - { - const void *data = mbuf->buffer + mbuf->pos; - mbuf->pos += size; - return data; - } - return NULL; -} - static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, region_element *node, INT *count) { GpStatus status; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 0e47607..f232210 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2170,7 +2170,7 @@ static const emfplus_record clipping_records[] = { { EmfPlusRecordTypeRestore }, { EmfPlusRecordTypeSetClipRect, 0x300 }, { EmfPlusRecordTypeFillRects, 0xc000 }, - { EmfPlusRecordTypeObject, ObjectTypeRegion << 8, 0, 1 }, + { EmfPlusRecordTypeObject, ObjectTypeRegion << 8 }, { EmfPlusRecordTypeSetClipRegion, 0x100, 0, 1 }, { EmfPlusRecordTypeEndOfFile }, { EMR_EOF },

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawPath records.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 363d24d45882e63c041fe360da34471d8c327730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d24d45882e63c041fe360d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:45:39 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawPath records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 6c18632..f18411b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2547,6 +2547,24 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeDrawPath: + { + EmfPlusDrawPath *draw = (EmfPlusDrawPath *)header; + BYTE path = flags & 0xff; + + if (dataSize != sizeof(draw->PenId)) + return InvalidParameter; + + if (path >= EmfPlusObjectTableSize || draw->PenId >= EmfPlusObjectTableSize) + return InvalidParameter; + + if (real_metafile->objtable[path].type != ObjectTypePath || + real_metafile->objtable[draw->PenId].type != ObjectTypePen) + return InvalidParameter; + + return GdipDrawPath(real_metafile->playback_graphics, real_metafile->objtable[draw->PenId].u.pen, + real_metafile->objtable[path].u.path); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Partially implement EmfPlusPen support for playback.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 9f45ef729c41f97414af17ce333d3fd8be890ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f45ef729c41f97414af17ce3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:45:38 2017 +0300 gdiplus/metafile: Partially implement EmfPlusPen support for playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 232 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 233 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d4c1fd9..f39838e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -394,6 +394,7 @@ struct emfplus_object { EmfPlusObjectType type; union { GpBrush *brush; + GpPen *pen; GpPath *path; GpImage *image; GpFont *font; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index b67f565..6c18632 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -199,6 +199,30 @@ enum LineStyle LineStyleCustom }; +typedef struct EmfPlusDashedLineData +{ + DWORD DashedLineDataSize; + BYTE data[1]; +} EmfPlusDashedLineData; + +typedef struct EmfPlusCompoundLineData +{ + DWORD CompoundLineDataSize; + BYTE data[1]; +} EmfPlusCompoundLineData; + +typedef struct EmfPlusCustomStartCapData +{ + DWORD CustomStartCapSize; + BYTE data[1]; +} EmfPlusCustomStartCapData; + +typedef struct EmfPlusCustomEndCapData +{ + DWORD CustomEndCapSize; + BYTE data[1]; +} EmfPlusCustomEndCapData; + typedef struct EmfPlusPenData { DWORD PenDataFlags; @@ -399,6 +423,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypeBrush: GdipDeleteBrush(object->u.brush); break; + case ObjectTypePen: + GdipDeletePen(object->u.pen); + break; case ObjectTypePath: GdipDeletePath(object->u.path); break; @@ -1685,6 +1712,93 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si return status; } +static GpStatus metafile_get_pen_brush_data_offset(EmfPlusPen *data, UINT data_size, DWORD *ret) +{ + EmfPlusPenData *pendata = (EmfPlusPenData *)data->data; + DWORD offset = FIELD_OFFSET(EmfPlusPen, data); + + if (data_size <= offset) + return InvalidParameter; + + offset += FIELD_OFFSET(EmfPlusPenData, OptionalData); + if (data_size <= offset) + return InvalidParameter; + + if (pendata->PenDataFlags & PenDataTransform) + offset += sizeof(EmfPlusTransformMatrix); + + if (pendata->PenDataFlags & PenDataStartCap) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataEndCap) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataJoin) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataMiterLimit) + offset += sizeof(REAL); + + if (pendata->PenDataFlags & PenDataLineStyle) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataDashedLineCap) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataDashedLineOffset) + offset += sizeof(REAL); + + if (pendata->PenDataFlags & PenDataDashedLine) + { + EmfPlusDashedLineData *dashedline = (EmfPlusDashedLineData *)((BYTE *)data + offset); + + offset += FIELD_OFFSET(EmfPlusDashedLineData, data); + if (data_size <= offset) + return InvalidParameter; + + offset += dashedline->DashedLineDataSize * sizeof(float); + } + + if (pendata->PenDataFlags & PenDataNonCenter) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataCompoundLine) + { + EmfPlusCompoundLineData *compoundline = (EmfPlusCompoundLineData *)((BYTE *)data + offset); + + offset += FIELD_OFFSET(EmfPlusCompoundLineData, data); + if (data_size <= offset) + return InvalidParameter; + + offset += compoundline->CompoundLineDataSize * sizeof(float); + } + + if (pendata->PenDataFlags & PenDataCustomStartCap) + { + EmfPlusCustomStartCapData *startcap = (EmfPlusCustomStartCapData *)((BYTE *)data + offset); + + offset += FIELD_OFFSET(EmfPlusCustomStartCapData, data); + if (data_size <= offset) + return InvalidParameter; + + offset += startcap->CustomStartCapSize; + } + + if (pendata->PenDataFlags & PenDataCustomEndCap) + { + EmfPlusCustomEndCapData *endcap = (EmfPlusCustomEndCapData *)((BYTE *)data + offset); + + offset += FIELD_OFFSET(EmfPlusCustomEndCapData, data); + if (data_size <= offset) + return InvalidParameter; + + offset += endcap->CustomEndCapSize; + } + + *ret = offset; + return Ok; +} + static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT data_size, const BYTE *record_data) { BYTE type = (flags >> 8) & 0xff; @@ -1700,6 +1814,124 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypeBrush: status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object); break; + case ObjectTypePen: + { + EmfPlusPen *data = (EmfPlusPen *)record_data; + EmfPlusPenData *pendata = (EmfPlusPenData *)data->data; + GpBrush *brush; + DWORD offset; + GpPen *pen; + + status = metafile_get_pen_brush_data_offset(data, data_size, &offset); + if (status != Ok) + return status; + + status = metafile_deserialize_brush(record_data + offset, data_size - offset, &brush); + if (status != Ok) + return status; + + status = GdipCreatePen2(brush, pendata->PenWidth, pendata->PenUnit, &pen); + GdipDeleteBrush(brush); + if (status != Ok) + return status; + + offset = FIELD_OFFSET(EmfPlusPenData, OptionalData); + + if (pendata->PenDataFlags & PenDataTransform) + { + FIXME("PenDataTransform is not supported.\n"); + offset += sizeof(EmfPlusTransformMatrix); + } + + if (pendata->PenDataFlags & PenDataStartCap) + { + if ((status = GdipSetPenStartCap(pen, *(DWORD *)((BYTE *)pendata + offset))) != Ok) + goto penfailed; + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataEndCap) + { + if ((status = GdipSetPenEndCap(pen, *(DWORD *)((BYTE *)pendata + offset))) != Ok) + goto penfailed; + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataJoin) + { + if ((status = GdipSetPenLineJoin(pen, *(DWORD *)((BYTE *)pendata + offset))) != Ok) + goto penfailed; + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataMiterLimit) + { + if ((status = GdipSetPenMiterLimit(pen, *(REAL *)((BYTE *)pendata + offset)) != Ok)) + goto penfailed; + offset += sizeof(REAL); + } + + if (pendata->PenDataFlags & PenDataLineStyle) + { + if ((status = GdipSetPenDashStyle(pen, *(DWORD *)((BYTE *)pendata + offset)) != Ok)) + goto penfailed; + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataDashedLineCap) + { + FIXME("PenDataDashedLineCap is not supported.\n"); + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataDashedLineOffset) + { + if ((status = GdipSetPenDashOffset(pen, *(REAL *)((BYTE *)pendata + offset))) != Ok) + goto penfailed; + offset += sizeof(REAL); + } + + if (pendata->PenDataFlags & PenDataDashedLine) + { + EmfPlusDashedLineData *dashedline = (EmfPlusDashedLineData *)((BYTE *)pendata + offset); + FIXME("PenDataDashedLine is not supported.\n"); + offset += FIELD_OFFSET(EmfPlusDashedLineData, data) + dashedline->DashedLineDataSize * sizeof(float); + } + + if (pendata->PenDataFlags & PenDataNonCenter) + { + FIXME("PenDataNonCenter is not supported.\n"); + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataCompoundLine) + { + EmfPlusCompoundLineData *compoundline = (EmfPlusCompoundLineData *)((BYTE *)pendata + offset); + FIXME("PenDataCompundLine is not supported.\n"); + offset += FIELD_OFFSET(EmfPlusCompoundLineData, data) + compoundline->CompoundLineDataSize * sizeof(float); + } + + if (pendata->PenDataFlags & PenDataCustomStartCap) + { + EmfPlusCustomStartCapData *startcap = (EmfPlusCustomStartCapData *)((BYTE *)pendata + offset); + FIXME("PenDataCustomStartCap is not supported.\n"); + offset += FIELD_OFFSET(EmfPlusCustomStartCapData, data) + startcap->CustomStartCapSize; + } + + if (pendata->PenDataFlags & PenDataCustomEndCap) + { + EmfPlusCustomEndCapData *endcap = (EmfPlusCustomEndCapData *)((BYTE *)pendata + offset); + FIXME("PenDataCustomEndCap is not supported.\n"); + offset += FIELD_OFFSET(EmfPlusCustomEndCapData, data) + endcap->CustomEndCapSize; + } + + object = pen; + break; + + penfailed: + GdipDeletePen(pen); + return status; + } case ObjectTypePath: status = metafile_deserialize_path(record_data, data_size, (GpPath **)&object); break;

1 0

Jacek Caban : mshtml: Rename fire_event_obj and dispatch_event.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: c29d776de82d75a77f044167af637f5519f68f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29d776de82d75a77f044167a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:10:46 2017 +0200 mshtml: Rename fire_event_obj and dispatch_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlevent.h | 4 ++-- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 8 ++++---- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/script.c | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 734f649..5f33e84 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2679,7 +2679,7 @@ static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEv TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCanceled); - return dispatch_event(&This->doc_node->node, bstrEventName, pvarEventObject, pfCanceled); + return fire_event(&This->doc_node->node, bstrEventName, pvarEventObject, pfCanceled); } static HRESULT WINAPI HTMLDocument4_createRenderStyle(IHTMLDocument4 *iface, BSTR v, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9f231f5..ed1aa86 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3526,7 +3526,7 @@ static HRESULT WINAPI HTMLElement3_fireEvent(IHTMLElement3 *iface, BSTR bstrEven TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(bstrEventName), debugstr_variant(pvarEventObject), pfCancelled); - return dispatch_event(&This->node, bstrEventName, pvarEventObject, pfCancelled); + return fire_event(&This->node, bstrEventName, pvarEventObject, pfCancelled); } static HRESULT WINAPI HTMLElement3_put_onresizestart(IHTMLElement3 *iface, VARIANT v) @@ -5196,7 +5196,7 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve hres = create_document_event(This->node.doc, EVENTID_HELP, &help_event); if(SUCCEEDED(hres)) { - fire_event_obj(&This->node.event_target, help_event); + dispatch_event(&This->node.event_target, help_event); IDOMEvent_Release(&help_event->IDOMEvent_iface); } *prevent_default = TRUE; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index e1b52b5..a428879 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1370,7 +1370,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } } -void fire_event_obj(EventTarget *event_target, DOMEvent *event) +void dispatch_event(EventTarget *event_target, DOMEvent *event) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; @@ -1472,7 +1472,7 @@ void fire_event_obj(EventTarget *event_target, DOMEvent *event) heap_free(target_chain); } -HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) +HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) { HTMLEventObj *event_obj = NULL; eventid_t eid; @@ -1520,7 +1520,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even if(SUCCEEDED(hres)) { event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface; - fire_event_obj(&node->event_target, event_obj->event); + dispatch_event(&node->event_target, event_obj->event); event_obj->event->event_obj = NULL; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 3e84ec1..0a967f2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -77,7 +77,7 @@ HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(EventTarget*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT detach_event(EventTarget*,BSTR,IDispatch*) DECLSPEC_HIDDEN; -HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT fire_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; @@ -85,7 +85,7 @@ HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; -void fire_event_obj(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; +void dispatch_event(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; HRESULT create_document_event(HTMLDocumentNode*,eventid_t,DOMEvent**) DECLSPEC_HIDDEN; HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5dc50cc..b174de2 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2175,7 +2175,7 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR if(FAILED(hres)) return hres; - fire_event_obj(&This->inner_window->event_target, event); + dispatch_event(&This->inner_window->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); return S_OK; } diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c811a0f..a72a587 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1502,7 +1502,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList hres = create_event_from_nsevent(aEvent, &event); if(SUCCEEDED(hres)) { - fire_event_obj(&node->event_target, event); + dispatch_event(&node->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 4617205..84971d8 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -274,13 +274,13 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event hres = create_document_event(doc, EVENTID_LOAD, &load_event); if(SUCCEEDED(hres)) { - fire_event_obj(&doc->node.event_target, load_event); + dispatch_event(&doc->node.event_target, load_event); IDOMEvent_Release(&load_event->IDOMEvent_iface); } hres = create_event_from_nsevent(event, &load_event); if(SUCCEEDED(hres)) { - fire_event_obj(&doc->window->event_target, load_event); + dispatch_event(&doc->window->event_target, load_event); IDOMEvent_Release(&load_event->IDOMEvent_iface); } }else { @@ -340,12 +340,12 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * hres = create_document_event(doc, event->event_id == EVENTID_FOCUS ? EVENTID_FOCUSIN : EVENTID_FOCUSOUT, &focus_event); if(SUCCEEDED(hres)) { - fire_event_obj(&node->event_target, focus_event); + dispatch_event(&node->event_target, focus_event); IDOMEvent_Release(&focus_event->IDOMEvent_iface); } } - fire_event_obj(&node->event_target, event); + dispatch_event(&node->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); node_release(node); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 0146527..fa1bb6e 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -454,14 +454,14 @@ static void notif_readystate(HTMLOuterWindow *window) hres = create_document_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, &event); if(SUCCEEDED(hres)) { event->no_event_obj = TRUE; - fire_event_obj(&window->base.inner_window->doc->node.event_target, event); + dispatch_event(&window->base.inner_window->doc->node.event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } if(window->frame_element) { hres = create_document_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, &event); if(SUCCEEDED(hres)) { - fire_event_obj(&window->frame_element->element.node.event_target, event); + dispatch_event(&window->frame_element->element.node.event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3b4fcc5..025db3b 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -733,7 +733,7 @@ static void dispatch_script_readystatechange_event(HTMLScriptElement *script) if(FAILED(hres)) return; - fire_event_obj(&script->element.node.event_target, event); + dispatch_event(&script->element.node.event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 455bbfb..a107fa2 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -195,7 +195,7 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i hres = create_event_from_nsevent(nsevent, &event); if(SUCCEEDED(hres) ){ event->no_event_obj = TRUE; - fire_event_obj(&This->xhr->event_target, event); + dispatch_event(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } return NS_OK;

1 0