July 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Allocate Mouse events via the types table.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 63877ba2c5643b97d9dca308dd51dc5bc7ab7e17 URL: https://gitlab.winehq.org/wine/wine/-/commit/63877ba2c5643b97d9dca308dd51dc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Allocate Mouse events via the types table. Instead of specially treating them. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 288 +++++++++++++++++++++++++++++++----------------- dlls/mshtml/htmlevent.h | 2 - 2 files changed, 185 insertions(+), 105 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Allocate Keyboard events via the types table.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 846e5baeb4807422abbad5152da13fe7363517e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/846e5baeb4807422abbad5152da13f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Allocate Keyboard events via the types table. Instead of specially treating them. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 164 ++++++++++++++++++++++++++++++------------------ dlls/mshtml/htmlevent.h | 2 - 2 files changed, 104 insertions(+), 62 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Remove FIXME comment from MessageEvent in event_types.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: a88411293528d678edfdd840f6351879e9403a5e URL: https://gitlab.winehq.org/wine/wine/-/commit/a88411293528d678edfdd840f63518… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Remove FIXME comment from MessageEvent in event_types. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2682840ae0e..0d7f51a9b1e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -78,7 +78,7 @@ static const WCHAR *event_types[] = { L"MouseEvent", L"Event", /* FIXME */ L"Event", /* FIXME */ - L"Event", /* FIXME */ + L"Event", /* We don't use Gecko's message events */ L"ProgressEvent", L"Event" /* FIXME */ };

1 0

Gabriel Ivăncescu : mshtml: Fix copy-paste mistake in test message.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: f0806c52a3fb44739cdd9eb2c468b11f2f6d129b URL: https://gitlab.winehq.org/wine/wine/-/commit/f0806c52a3fb44739cdd9eb2c468b1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Fix copy-paste mistake in test message. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/xhr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 8d9af26a943..58665499052 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -54,7 +54,7 @@ function test_xhr() { ok(loadstart, "onloadstart not fired before onloadend"); var props = [ "initProgressEvent", "lengthComputable", "loaded", "total" ]; for(var i = 0; i < props.length; i++) - ok(props[i] in e, props[i] + " not available in loadstart"); + ok(props[i] in e, props[i] + " not available in loadend"); next_test(); }; }

1 0

Gabriel Ivăncescu : mshtml: Implement ProgressEvent's lengthComputable prop.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 8d97a7b37ee01a80827a362631983aef51c988cb URL: https://gitlab.winehq.org/wine/wine/-/commit/8d97a7b37ee01a80827a362631983a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Implement ProgressEvent's lengthComputable prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/xhr.js | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0d7f51a9b1e..3fac9c05309 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2498,8 +2498,17 @@ static HRESULT WINAPI DOMProgressEvent_Invoke(IDOMProgressEvent *iface, DISPID d static HRESULT WINAPI DOMProgressEvent_get_lengthComputable(IDOMProgressEvent *iface, VARIANT_BOOL *p) { DOMProgressEvent *This = impl_from_IDOMProgressEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + cpp_bool b; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMProgressEvent_GetLengthComputable(This->nsevent, &b); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + *p = b ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DOMProgressEvent_get_loaded(IDOMProgressEvent *iface, ULONGLONG *p) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 58665499052..9af44850a39 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -47,6 +47,7 @@ function test_xhr() { var props = [ "initProgressEvent", "lengthComputable", "loaded", "total" ]; for(var i = 0; i < props.length; i++) ok(props[i] in e, props[i] + " not available in loadstart"); + ok(e.lengthComputable === false, "lengthComputable in loadstart = " + e.lengthComputable); loadstart = true; }; xhr.onloadend = function(e) { @@ -55,6 +56,7 @@ function test_xhr() { var props = [ "initProgressEvent", "lengthComputable", "loaded", "total" ]; for(var i = 0; i < props.length; i++) ok(props[i] in e, props[i] + " not available in loadend"); + ok(e.lengthComputable === true, "lengthComputable in loadend = " + e.lengthComputable); next_test(); }; } @@ -171,6 +173,9 @@ function test_timeout() { else ok(props[r] in e, props[r] + " not available"); } + if(v >= 10) { + ok(e.lengthComputable === false, "lengthComputable = " + e.lengthComputable); + } next_test(); }

1 0

Gabriel Ivăncescu : mshtml: Implement ProgressEvent's loaded prop.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 78bf1b62ec2b75e41569ddda5a62647fa4efdf08 URL: https://gitlab.winehq.org/wine/wine/-/commit/78bf1b62ec2b75e41569ddda5a6264… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Implement ProgressEvent's loaded prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 6 ++++-- dlls/mshtml/tests/xhr.js | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3fac9c05309..55511f3ac79 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2514,8 +2514,10 @@ static HRESULT WINAPI DOMProgressEvent_get_lengthComputable(IDOMProgressEvent *i static HRESULT WINAPI DOMProgressEvent_get_loaded(IDOMProgressEvent *iface, ULONGLONG *p) { DOMProgressEvent *This = impl_from_IDOMProgressEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return map_nsresult(nsIDOMProgressEvent_GetLoaded(This->nsevent, p)); } static HRESULT WINAPI DOMProgressEvent_get_total(IDOMProgressEvent *iface, ULONGLONG *p) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 9af44850a39..c60107c556f 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -48,6 +48,7 @@ function test_xhr() { for(var i = 0; i < props.length; i++) ok(props[i] in e, props[i] + " not available in loadstart"); ok(e.lengthComputable === false, "lengthComputable in loadstart = " + e.lengthComputable); + ok(e.loaded === 0, "loaded in loadstart = " + e.loaded); loadstart = true; }; xhr.onloadend = function(e) { @@ -57,6 +58,8 @@ function test_xhr() { for(var i = 0; i < props.length; i++) ok(props[i] in e, props[i] + " not available in loadend"); ok(e.lengthComputable === true, "lengthComputable in loadend = " + e.lengthComputable); + todo_wine. + ok(e.loaded === xml.length, "loaded in loadend = " + e.loaded); next_test(); }; } @@ -175,6 +178,7 @@ function test_timeout() { } if(v >= 10) { ok(e.lengthComputable === false, "lengthComputable = " + e.lengthComputable); + ok(e.loaded === 0, "loaded = " + e.loaded); } next_test(); }

1 0

Gabriel Ivăncescu : mshtml: Implement ProgressEvent's total prop.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 228c824d483c6a9b782f02a56ff0ff28bfdfc6ad URL: https://gitlab.winehq.org/wine/wine/-/commit/228c824d483c6a9b782f02a56ff0ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Implement ProgressEvent's total prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 12 ++++++++++-- dlls/mshtml/tests/xhr.js | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 55511f3ac79..24c107487af 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2523,8 +2523,16 @@ static HRESULT WINAPI DOMProgressEvent_get_loaded(IDOMProgressEvent *iface, ULON static HRESULT WINAPI DOMProgressEvent_get_total(IDOMProgressEvent *iface, ULONGLONG *p) { DOMProgressEvent *This = impl_from_IDOMProgressEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool b; + + TRACE("(%p)->(%p)\n", This, p); + + if(NS_FAILED(nsIDOMProgressEvent_GetLengthComputable(This->nsevent, &b)) || !b) { + *p = ~0; + return S_OK; + } + + return map_nsresult(nsIDOMProgressEvent_GetTotal(This->nsevent, p)); } static HRESULT WINAPI DOMProgressEvent_initProgressEvent(IDOMProgressEvent *iface, BSTR type, VARIANT_BOOL can_bubble, diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index c60107c556f..cc8a03dadb4 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -49,6 +49,7 @@ function test_xhr() { ok(props[i] in e, props[i] + " not available in loadstart"); ok(e.lengthComputable === false, "lengthComputable in loadstart = " + e.lengthComputable); ok(e.loaded === 0, "loaded in loadstart = " + e.loaded); + ok(e.total === 18446744073709552000, "total in loadstart = " + e.total); loadstart = true; }; xhr.onloadend = function(e) { @@ -60,6 +61,8 @@ function test_xhr() { ok(e.lengthComputable === true, "lengthComputable in loadend = " + e.lengthComputable); todo_wine. ok(e.loaded === xml.length, "loaded in loadend = " + e.loaded); + todo_wine. + ok(e.total === xml.length, "total in loadend = " + e.total); next_test(); }; } @@ -179,6 +182,7 @@ function test_timeout() { if(v >= 10) { ok(e.lengthComputable === false, "lengthComputable = " + e.lengthComputable); ok(e.loaded === 0, "loaded = " + e.loaded); + ok(e.total === 18446744073709552000, "total = " + e.total); } next_test(); }

1 0

Gabriel Ivăncescu : mshtml: Inform Gecko of progress done via OnProgress.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 434c6e2d325d05f5a69f597df0ed4df7034a5ba3 URL: https://gitlab.winehq.org/wine/wine/-/commit/434c6e2d325d05f5a69f597df0ed4d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Inform Gecko of progress done via OnProgress. Currently we don't support 64-bit progress values (BINDSTATUS_64BIT_PROGRESS is not implemented in wine), so this is limited to 4 GB. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/binding.h | 4 ++- dlls/mshtml/navigate.c | 68 ++++++++++++++++++++++++++++++++++++------------ dlls/mshtml/nsiface.idl | 11 ++++++++ dlls/mshtml/script.c | 2 +- dlls/mshtml/tests/xhr.js | 2 -- 5 files changed, 67 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 9a043864927..5d2915a836b 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -104,6 +104,8 @@ struct nsChannelBSC { nsChannel *nschannel; nsIStreamListener *nslistener; nsISupports *nscontext; + ULONG progress; + ULONG total; BOOL is_js; BOOL is_doc_channel; BOOL response_processed; @@ -117,7 +119,7 @@ struct BSCallbackVtbl { HRESULT (*start_binding)(BSCallback*); HRESULT (*stop_binding)(BSCallback*,HRESULT); HRESULT (*read_data)(BSCallback*,IStream*); - HRESULT (*on_progress)(BSCallback*,ULONG,LPCWSTR); + HRESULT (*on_progress)(BSCallback*,ULONG,ULONG,ULONG,LPCWSTR); HRESULT (*on_response)(BSCallback*,DWORD,LPCWSTR); HRESULT (*beginning_transaction)(BSCallback*,WCHAR**); }; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6f684630cd6..ef764bde58c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -326,7 +326,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, TRACE("%p)->(%lu %lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); - return This->vtbl->on_progress(This, ulStatusCode, szStatusText); + return This->vtbl->on_progress(This, ulProgress, ulProgressMax, ulStatusCode, szStatusText); } static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, @@ -1067,6 +1067,37 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) } } +static void notify_progress(nsChannelBSC *This) +{ + nsChannel *nschannel = This->nschannel; + nsIProgressEventSink *sink = NULL; + nsresult nsres; + + if(!nschannel) + return; + + if(nschannel->notif_callback) + if(NS_FAILED(nsIInterfaceRequestor_GetInterface(nschannel->notif_callback, &IID_nsIProgressEventSink, (void**)&sink))) + sink = NULL; + + if(!sink && nschannel->load_group) { + nsIRequestObserver *req_observer; + + if(NS_SUCCEEDED(nsILoadGroup_GetGroupObserver(nschannel->load_group, &req_observer)) && req_observer) { + nsres = nsIRequestObserver_QueryInterface(req_observer, &IID_nsIProgressEventSink, (void**)&sink); + nsIRequestObserver_Release(req_observer); + if(NS_FAILED(nsres)) + sink = NULL; + } + } + + if(sink) { + nsIProgressEventSink_OnProgress(sink, (nsIRequest*)&nschannel->nsIHttpChannel_iface, This->nscontext, + This->progress, (This->total == ~0) ? -1 : This->total); + nsIProgressEventSink_Release(sink); + } +} + static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) { DWORD read; @@ -1147,6 +1178,8 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) return hres; } + notify_progress(This); + nsres = nsIStreamListener_OnDataAvailable(This->nslistener, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, &This->nsstream->nsIInputStream_iface, This->bsc.read-This->nsstream->buf_size, @@ -1656,7 +1689,7 @@ static void handle_extern_mime_navigation(nsChannelBSC *This) IUri_Release(uri); } -static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR status_text) +static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG progress, ULONG total, ULONG status_code, LPCWSTR status_text) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); @@ -1684,21 +1717,24 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW DWORD status, size = sizeof(DWORD); HRESULT hres; - if(!This->bsc.binding) - break; - - hres = IBinding_QueryInterface(This->bsc.binding, &IID_IWinInetHttpInfo, (void**)&http_info); - if(FAILED(hres)) - break; - - hres = IWinInetHttpInfo_QueryInfo(http_info, - HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); - IWinInetHttpInfo_Release(http_info); - if(FAILED(hres) || status == HTTP_STATUS_OK) - break; - - handle_navigation_error(This, status); + if(This->bsc.binding) { + hres = IBinding_QueryInterface(This->bsc.binding, &IID_IWinInetHttpInfo, (void**)&http_info); + if(SUCCEEDED(hres)) { + hres = IWinInetHttpInfo_QueryInfo(http_info, + HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); + IWinInetHttpInfo_Release(http_info); + if(SUCCEEDED(hres) && status != HTTP_STATUS_OK) + handle_navigation_error(This, status); + } + } + /* fall through */ } + case BINDSTATUS_DOWNLOADINGDATA: + case BINDSTATUS_ENDDOWNLOADDATA: + /* Defer it to just before calling OnDataAvailable, otherwise it can have wrong state */ + This->progress = progress; + This->total = total; + break; } return S_OK; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index c4b479b16e3..f6e0a909278 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -771,6 +771,17 @@ interface nsIChannelEventSink : nsISupports nsIAsyncVerifyRedirectCallback *callback); } +[ + object, + uuid(87d55fba-cb7e-4f38-84c1-5c6c2b2a55e9), + local +] +interface nsIProgressEventSink : nsISupports +{ + nsresult OnProgress(nsIRequest *aRequest, nsISupports *aContext, int64_t aProgress, int64_t aProgressMax); + nsresult OnStatus(nsIRequest *aRequest, nsISupports *aContext, nsresult aStatus, const char16_t *aStatusArg); +} + [ object, uuid(79de76e5-994e-4f6b-81aa-42d9adb6e67e), diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index e49449a61f8..769ca72db6f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1053,7 +1053,7 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) return S_OK; } -static HRESULT ScriptBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR status_text) +static HRESULT ScriptBSC_on_progress(BSCallback *bsc, ULONG progress, ULONG total, ULONG status_code, LPCWSTR status_text) { return S_OK; } diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index cc8a03dadb4..dd3750632c7 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -59,9 +59,7 @@ function test_xhr() { for(var i = 0; i < props.length; i++) ok(props[i] in e, props[i] + " not available in loadend"); ok(e.lengthComputable === true, "lengthComputable in loadend = " + e.lengthComputable); - todo_wine. ok(e.loaded === xml.length, "loaded in loadend = " + e.loaded); - todo_wine. ok(e.total === xml.length, "total in loadend = " + e.total); next_test(); };

1 0

Gabriel Ivăncescu : mshtml: Use a table to construct the different event types by their interface.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 79c46d470daa8e3c55707da4f20688acced7b81f URL: https://gitlab.winehq.org/wine/wine/-/commit/79c46d470daa8e3c55707da4f20688… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Use a table to construct the different event types by their interface. Avoids hardcoding as the amount of events grows to become more manageable, which will also be used for the existing hardcoded "special" events (UI, Mouse, Keyboard). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 125 ++++++++++++++++++++++++++++-------------------- dlls/mshtml/nsiface.idl | 14 ++++++ 2 files changed, 88 insertions(+), 51 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0f6525af86a..f5e889712c0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2299,6 +2299,7 @@ static void DOMMessageEvent_destroy(DOMEvent *event) typedef struct { DOMEvent event; IDOMProgressEvent IDOMProgressEvent_iface; + nsIDOMProgressEvent *nsevent; } DOMProgressEvent; static inline DOMProgressEvent *impl_from_IDOMProgressEvent(IDOMProgressEvent *iface) @@ -2412,6 +2413,12 @@ static void *DOMProgressEvent_query_interface(DOMEvent *event, REFIID riid) return NULL; } +static void DOMProgressEvent_destroy(DOMEvent *event) +{ + DOMProgressEvent *This = DOMProgressEvent_from_DOMEvent(event); + nsIDOMProgressEvent_Release(This->nsevent); +} + static const tid_t DOMEvent_iface_tids[] = { IDOMEvent_tid, 0 @@ -2504,64 +2511,20 @@ dispex_static_data_t DOMProgressEvent_dispex = { DOMProgressEvent_iface_tids }; -static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) -{ - nsISupports *iface; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(event, riid, (void**)&iface); - if(NS_FAILED(nsres)) - return FALSE; - - nsISupports_Release(iface); - return TRUE; -} - -static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, eventid_t event_id) +static void *event_ctor(unsigned size, dispex_static_data_t *dispex_data, void *(*query_interface)(DOMEvent*,REFIID), + void (*destroy)(DOMEvent*), nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode) { - dispex_static_data_t *dispex_data = &DOMEvent_dispex; - DOMEvent *event = NULL; + DOMEvent *event = heap_alloc_zero(size); nsresult nsres; - if(check_event_iface(nsevent, &IID_nsIDOMCustomEvent)) { - DOMCustomEvent *custom_event = heap_alloc_zero(sizeof(*custom_event)); - if(!custom_event) - return NULL; - - custom_event->IDOMCustomEvent_iface.lpVtbl = &DOMCustomEventVtbl; - custom_event->event.query_interface = DOMCustomEvent_query_interface; - custom_event->event.destroy = DOMCustomEvent_destroy; - event = &custom_event->event; - dispex_data = &DOMCustomEvent_dispex; - }else if(event_id == EVENTID_MESSAGE) { - DOMMessageEvent *message_event = heap_alloc_zero(sizeof(*message_event)); - if(!message_event) - return NULL; - - message_event->IDOMMessageEvent_iface.lpVtbl = &DOMMessageEventVtbl; - message_event->event.query_interface = DOMMessageEvent_query_interface; - message_event->event.destroy = DOMMessageEvent_destroy; - event = &message_event->event; - dispex_data = &DOMMessageEvent_dispex; - }else if(event_info[event_id].type == EVENT_TYPE_PROGRESS && compat_mode >= COMPAT_MODE_IE10) { - DOMProgressEvent *progress_event = heap_alloc_zero(sizeof(*progress_event)); - if(!progress_event) - return NULL; - - progress_event->IDOMProgressEvent_iface.lpVtbl = &DOMProgressEventVtbl; - progress_event->event.query_interface = DOMProgressEvent_query_interface; - event = &progress_event->event; - dispex_data = &DOMProgressEvent_dispex; - }else { - event = heap_alloc_zero(sizeof(*event)); - if(!event) - return NULL; - } - + if(!event) + return NULL; event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; event->IDOMUIEvent_iface.lpVtbl = &DOMUIEventVtbl; event->IDOMMouseEvent_iface.lpVtbl = &DOMMouseEventVtbl; event->IDOMKeyboardEvent_iface.lpVtbl = &DOMKeyboardEventVtbl; + event->query_interface = query_interface; + event->destroy = destroy; event->ref = 1; event->event_id = event_id; if(event_id != EVENTID_LAST) { @@ -2599,6 +2562,66 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev return event; } +static DOMEvent *custom_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode) +{ + DOMCustomEvent *custom_event = event_ctor(sizeof(DOMCustomEvent), &DOMCustomEvent_dispex, + DOMCustomEvent_query_interface, DOMCustomEvent_destroy, nsevent, event_id, compat_mode); + if(!custom_event) return NULL; + custom_event->IDOMCustomEvent_iface.lpVtbl = &DOMCustomEventVtbl; + nsIDOMCustomEvent_Release(iface); + return &custom_event->event; +} + +static DOMEvent *progress_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode) +{ + DOMProgressEvent *progress_event; + + if(compat_mode < COMPAT_MODE_IE10) + return event_ctor(sizeof(DOMEvent), &DOMEvent_dispex, NULL, NULL, nsevent, event_id, compat_mode); + + if(!(progress_event = event_ctor(sizeof(DOMProgressEvent), &DOMProgressEvent_dispex, + DOMProgressEvent_query_interface, DOMProgressEvent_destroy, nsevent, event_id, compat_mode))) + return NULL; + progress_event->IDOMProgressEvent_iface.lpVtbl = &DOMProgressEventVtbl; + progress_event->nsevent = iface; + return &progress_event->event; +} + +static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, eventid_t event_id) +{ + static const struct { + REFIID iid; + DOMEvent *(*ctor)(void *iface, nsIDOMEvent *nsevent, eventid_t, compat_mode_t); + } types_table[] = { + { &IID_nsIDOMCustomEvent, custom_event_ctor }, + { &IID_nsIDOMProgressEvent, progress_event_ctor }, + }; + DOMEvent *event; + unsigned i; + + if(event_id == EVENTID_MESSAGE) { + DOMMessageEvent *message_event = event_ctor(sizeof(DOMMessageEvent), &DOMMessageEvent_dispex, + DOMMessageEvent_query_interface, DOMMessageEvent_destroy, nsevent, event_id, compat_mode); + if(!message_event) + return NULL; + message_event->IDOMMessageEvent_iface.lpVtbl = &DOMMessageEventVtbl; + return &message_event->event; + } + + for(i = 0; i < ARRAY_SIZE(types_table); i++) { + void *iface; + nsresult nsres = nsIDOMEvent_QueryInterface(nsevent, types_table[i].iid, &iface); + if(NS_SUCCEEDED(nsres)) { + /* Transfer the iface ownership to the ctor on success */ + if(!(event = types_table[i].ctor(iface, nsevent, event_id, compat_mode))) + nsISupports_Release(iface); + return event; + } + } + + return event_ctor(sizeof(DOMEvent), &DOMEvent_dispex, NULL, NULL, nsevent, event_id, compat_mode); +} + HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, compat_mode_t compat_mode, DOMEvent **ret_event) { eventid_t event_id = EVENTID_LAST; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index cad48f725c6..c4b479b16e3 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3304,6 +3304,20 @@ interface nsIDOMKeyEvent : nsIDOMUIEvent nsresult GetKey(nsAString *aKey); } +[ + object, + uuid(e0682338-4c3f-4d3a-9487-d7492ea76335), + local +] +interface nsIDOMProgressEvent : nsISupports +{ + nsresult GetLengthComputable(bool *aLengthComputable); + nsresult GetLoaded(uint64_t *aLoaded); + nsresult GetTotal(uint64_t *aTotal); + nsresult InitProgressEvent(const nsAString *typeArg, bool canBubbleArg, bool cancelableArg, + bool lengthComputableArg, uint64_t loadedArg, uint64_t totalArg); +} + [ object, uuid(5be16b03-36f9-4ca8-b2c5-0daadf3cd1b3),

1 0

Gabriel Ivăncescu : mshtml: Allocate UI events via the types table.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: c423d070be5aa67c1ec34e0b02d5c2fef4de3404 URL: https://gitlab.winehq.org/wine/wine/-/commit/c423d070be5aa67c1ec34e0b02d5c2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 25 21:54:04 2022 +0300 mshtml: Allocate UI events via the types table. Instead of specially treating them. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 123 ++++++++++++++++++++++++++++++------------------ dlls/mshtml/htmlevent.h | 2 - 2 files changed, 78 insertions(+), 47 deletions(-)

1 0