wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Rémi Bernon : winegstreamer: Only filter video caps attributes when format uses 0.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 7adcdb6ff8c6ac321a1f21bfa4123d08c3bc52d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7adcdb6ff8c6ac321a1f21bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 5 11:45:47 2022 +0200 winegstreamer: Only filter video caps attributes when format uses 0. In wg_transform we only want to remove width/height/framerate if the transform supports format change, and we want to keep the caps fixed otherwise so we can use gst_caps_is_always_compatible to monitor caps changes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 2 +- dlls/winegstreamer/h264_decoder.c | 8 ++++++++ dlls/winegstreamer/wg_format.c | 9 ++++++--- dlls/winegstreamer/wg_parser.c | 6 ++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e873712085b..9de7308f9ff 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -7200,7 +7200,7 @@ static void test_h264_decoder(void) "got status %#lx\n", status); hr = IMFSample_GetTotalLength(output.pSample, &length); ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); - todo_wine_if(length == 1920 * 1080 * 3 / 2) + todo_wine ok(length == 0, "got length %lu\n", length); ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index b7174d097ad..66d53a3a5ce 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -75,6 +75,14 @@ static HRESULT try_create_wg_transform(struct h264_decoder *decoder) if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) return MF_E_INVALIDMEDIATYPE; + /* Don't force any specific size, H264 streams already have the metadata for it + * and will generate a MF_E_TRANSFORM_STREAM_CHANGE result later. + */ + output_format.u.video.width = 0; + output_format.u.video.height = 0; + output_format.u.video.fps_d = 0; + output_format.u.video.fps_n = 0; + if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format))) return E_FAIL; diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 5b3a5617ff1..4cebeac9182 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -394,11 +394,14 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format) gst_video_info_set_format(&info, video_format, format->u.video.width, abs(format->u.video.height)); if ((caps = gst_video_info_to_caps(&info))) { - /* Clear some fields that shouldn't prevent us from connecting. */ for (i = 0; i < gst_caps_get_size(caps); ++i) { - gst_structure_remove_fields(gst_caps_get_structure(caps, i), - "framerate", "pixel-aspect-ratio", "colorimetry", "chroma-site", NULL); + if (!format->u.video.width) + gst_structure_remove_fields(gst_caps_get_structure(caps, i), "width", NULL); + if (!format->u.video.height) + gst_structure_remove_fields(gst_caps_get_structure(caps, i), "height", NULL); + if (!format->u.video.fps_d && !format->u.video.fps_n) + gst_structure_remove_fields(gst_caps_get_structure(caps, i), "framerate", NULL); } } return caps; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 48b88a4b11c..7d55897aa0a 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -598,6 +598,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) { GstCaps *caps, *filter, *temp; gchar *str; + gsize i; gst_query_parse_caps(query, &filter); @@ -608,6 +609,11 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) if (!caps) return FALSE; + /* Clear some fields that shouldn't prevent us from connecting. */ + for (i = 0; i < gst_caps_get_size(caps); ++i) + gst_structure_remove_fields(gst_caps_get_structure(caps, i), + "framerate", "pixel-aspect-ratio", "colorimetry", "chroma-site", NULL); + str = gst_caps_to_string(caps); GST_LOG("Stream caps are \"%s\".", str); g_free(str);

1 0

Rémi Bernon : winegstreamer: Avoid leaking buffer list in wg_transform_read_data.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 2ae08f035fdb5665eab4cef6333344ace528c61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae08f035fdb5665eab4cef6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 23 17:53:02 2022 +0200 winegstreamer: Avoid leaking buffer list in wg_transform_read_data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 9699d7e0a31..d75593daedd 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -448,6 +448,7 @@ NTSTATUS wg_transform_read_data(void *args) else if (!(transform->input = gst_buffer_list_new())) { GST_ERROR("Failed to allocate new input queue"); + gst_buffer_list_unref(input); return STATUS_NO_MEMORY; } else if ((ret = gst_pad_push_list(transform->my_src, input)))

1 0

Rémi Bernon : winegstreamer: Return early if output buffer is too small.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 0892b92b56531aa3b1c67948bf0cd06152ed361e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0892b92b56531aa3b1c67948… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 25 11:06:55 2022 +0200 winegstreamer: Return early if output buffer is too small. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/h264_decoder.c | 8 +++++--- dlls/winegstreamer/wma_decoder.c | 16 +++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index de823741ba9..b7174d097ad 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -556,10 +556,12 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return hr; if (wg_sample->max_size < info.cbSize) - hr = MF_E_BUFFERTOOSMALL; - else - hr = wg_transform_read_data(decoder->wg_transform, wg_sample); + { + mf_destroy_wg_sample(wg_sample); + return MF_E_BUFFERTOOSMALL; + } + hr = wg_transform_read_data(decoder->wg_transform, wg_sample); mf_destroy_wg_sample(wg_sample); return hr; } diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 71369add244..70563649c9c 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -539,10 +539,12 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS /* WMA transform uses fixed size input samples and ignores samples with invalid sizes */ if (wg_sample->size % info.cbSize) - hr = S_OK; - else - hr = wg_transform_push_data(decoder->wg_transform, wg_sample); + { + mf_destroy_wg_sample(wg_sample); + return S_OK; + } + hr = wg_transform_push_data(decoder->wg_transform, wg_sample); mf_destroy_wg_sample(wg_sample); return hr; } @@ -579,8 +581,12 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, wg_sample->size = 0; if (wg_sample->max_size < info.cbSize) - hr = MF_E_BUFFERTOOSMALL; - else if (SUCCEEDED(hr = wg_transform_read_data(decoder->wg_transform, wg_sample))) + { + mf_destroy_wg_sample(wg_sample); + return MF_E_BUFFERTOOSMALL; + } + + if (SUCCEEDED(hr = wg_transform_read_data(decoder->wg_transform, wg_sample))) { if (wg_sample->flags & WG_SAMPLE_FLAG_INCOMPLETE) samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_INCOMPLETE;

1 0

Rémi Bernon : winegstreamer: Set wg_transform output sample size on gst_buffer_map failure.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 21832ac226da7e31944df26bf02ff231d2a1a941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21832ac226da7e31944df26b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 23:32:54 2022 +0200 winegstreamer: Set wg_transform output sample size on gst_buffer_map failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index ae6e948318a..9699d7e0a31 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -392,6 +392,7 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, struct wg_sample * if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) { GST_ERROR("Failed to map buffer %p", buffer); + sample->size = 0; return STATUS_UNSUCCESSFUL; } @@ -464,10 +465,7 @@ NTSTATUS wg_transform_read_data(void *args) } if ((status = read_transform_output_data(transform->output_buffer, sample))) - { - sample->size = 0; return status; - } if (!(sample->flags & WG_SAMPLE_FLAG_INCOMPLETE)) {

1 0

Rémi Bernon : winegstreamer: Append a videoconvert element to wg_transform video output.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: ee7958bac7a176aa250cdcc23b9bb5c009204015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7958bac7a176aa250cdcc2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 13 00:52:55 2022 +0200 winegstreamer: Append a videoconvert element to wg_transform video output. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 21392a82509..ae6e948318a 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -268,6 +268,11 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_VIDEO: + if (!(element = create_element("videoconvert", "base")) + || !transform_append_element(transform, element, &first, &last)) + goto out; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); break; case WG_MAJOR_TYPE_MPEG1_AUDIO:

1 0

Gabriel Ivăncescu : mshtml: Implement ontimeout event for XMLHttpRequest.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: b90c53797de4c3dd2d8ff2eaba7421dad411c972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b90c53797de4c3dd2d8ff2ea… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed May 25 19:13:16 2022 +0300 mshtml: Implement ontimeout event for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/script.c | 69 +++++++++++++++------ dlls/mshtml/tests/xhr.js | 35 ++++++++++- dlls/mshtml/xmlhttprequest.c | 9 +-- 6 files changed, 236 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b90c53797de4c3dd2d8f…

1 0

Gabriel Ivăncescu : mshtml: Use an event mask and list in XMLHttpReqEventListener.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 519ef7c5f71f30fbc49613c9ebe9fc8796e872ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=519ef7c5f71f30fbc49613c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed May 25 19:13:15 2022 +0300 mshtml: Use an event mask and list in XMLHttpReqEventListener. Instead of hardcoding each event, since there will be plenty more. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/xmlhttprequest.c | 51 +++++++++++++++++++------------------------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f28dd639ff6..92fa489dae3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -226,6 +226,11 @@ static eventid_t attr_to_eid(const WCHAR *str) return EVENTID_LAST; } +const WCHAR *get_event_name(eventid_t eid) +{ + return event_info[eid].name; +} + static listener_container_t *get_listener_container(EventTarget *event_target, const WCHAR *type, BOOL alloc) { const event_target_vtbl_t *vtbl; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 5d534512739..d49b06dca86 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -93,6 +93,7 @@ typedef struct DOMEvent { BOOL no_event_obj; } DOMEvent; +const WCHAR *get_event_name(eventid_t) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN; void release_event_target(EventTarget*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 066b94ba5e7..c9f71498e3e 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -94,12 +94,16 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) return S_OK; } +static const eventid_t events[] = { + EVENTID_READYSTATECHANGE, + EVENTID_LOAD, +}; + typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; LONG ref; HTMLXMLHttpRequest *xhr; - BOOL readystatechange_event; - BOOL load_event; + DWORD events_mask; } XMLHttpReqEventListener; struct HTMLXMLHttpRequest { @@ -115,21 +119,17 @@ struct HTMLXMLHttpRequest { static void detach_xhr_event_listener(XMLHttpReqEventListener *event_listener) { nsIDOMEventTarget *event_target; + DWORD events_mask, i; nsAString str; nsresult nsres; nsres = nsIXMLHttpRequest_QueryInterface(event_listener->xhr->nsxhr, &IID_nsIDOMEventTarget, (void**)&event_target); assert(nsres == NS_OK); - if(event_listener->readystatechange_event) { - nsAString_InitDepend(&str, L"onreadystatechange"); - nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); - nsAString_Finish(&str); - assert(nsres == NS_OK); - } - - if(event_listener->load_event) { - nsAString_InitDepend(&str, L"load"); + for(events_mask = event_listener->events_mask, i = 0; events_mask; events_mask >>= 1, i++) { + if(!(events_mask & 1)) + continue; + nsAString_InitDepend(&str, get_event_name(events[i])); nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); nsAString_Finish(&str); assert(nsres == NS_OK); @@ -941,22 +941,18 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); nsIDOMEventTarget *nstarget; - const WCHAR *type_name; nsAString type_str; + const WCHAR *name; nsresult nsres; + unsigned i; TRACE("(%p)\n", This); - switch(eid) { - case EVENTID_READYSTATECHANGE: - type_name = L"readystatechange"; - break; - case EVENTID_LOAD: - type_name = L"load"; - break; - default: + for(i = 0; i < ARRAY_SIZE(events); i++) + if(eid == events[i]) + break; + if(i >= ARRAY_SIZE(events)) return; - } if(!This->event_listener) { This->event_listener = heap_alloc(sizeof(*This->event_listener)); @@ -966,25 +962,22 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) This->event_listener->nsIDOMEventListener_iface.lpVtbl = &XMLHttpReqEventListenerVtbl; This->event_listener->ref = 1; This->event_listener->xhr = This; - This->event_listener->readystatechange_event = FALSE; - This->event_listener->load_event = FALSE; + This->event_listener->events_mask = 0; } nsres = nsIXMLHttpRequest_QueryInterface(This->nsxhr, &IID_nsIDOMEventTarget, (void**)&nstarget); assert(nsres == NS_OK); - nsAString_InitDepend(&type_str, type_name); + name = get_event_name(events[i]); + nsAString_InitDepend(&type_str, name); nsres = nsIDOMEventTarget_AddEventListener(nstarget, &type_str, &This->event_listener->nsIDOMEventListener_iface, FALSE, TRUE, 2); nsAString_Finish(&type_str); if(NS_FAILED(nsres)) - ERR("AddEventListener(%s) failed: %08lx\n", debugstr_w(type_name), nsres); + ERR("AddEventListener(%s) failed: %08lx\n", debugstr_w(name), nsres); nsIDOMEventTarget_Release(nstarget); - if(eid == EVENTID_READYSTATECHANGE) - This->event_listener->readystatechange_event = TRUE; - else - This->event_listener->load_event = TRUE; + This->event_listener->events_mask |= 1 << i; } static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode)

1 0

Gabriel Ivăncescu : mshtml: Use binary search when looking up events by name.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 5eec1429fd8228af08b8f155b837a9a021b38d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eec1429fd8228af08b8f155… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed May 25 19:13:14 2022 +0300 mshtml: Use binary search when looking up events by name. Since they're already sorted (except for DOMContentLoaded because of case sensitivity). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 27 ++++++++++++++++++--------- dlls/mshtml/htmlevent.h | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fe3433692f3..f28dd639ff6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -105,7 +105,10 @@ typedef struct { #define EVENT_MOUSE_TO_RELATED 0x0100 #define EVENT_MOUSE_FROM_RELATED 0x0200 +/* Keep these sorted case sensitively */ static const event_info_t event_info[] = { + {L"DOMContentLoaded", EVENT_TYPE_EVENT, 0, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"abort", EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT, EVENT_BIND_TO_TARGET}, {L"animationend", EVENT_TYPE_EVENT, DISPID_EVPROP_ONANIMATIONEND, @@ -128,8 +131,6 @@ static const event_info_t event_info[] = { EVENT_FIXME | EVENT_BUBBLES}, {L"dblclick", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONDBLCLICK, EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, - {L"DOMContentLoaded", EVENT_TYPE_EVENT, 0, - EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"drag", EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAG, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"dragstart", EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAGSTART, @@ -192,11 +193,15 @@ C_ASSERT(ARRAY_SIZE(event_info) == EVENTID_LAST); static eventid_t str_to_eid(const WCHAR *str) { - int i; + unsigned i, a = 0, b = ARRAY_SIZE(event_info); + int c; - for(i=0; i < ARRAY_SIZE(event_info); i++) { - if(!wcscmp(event_info[i].name, str)) + while(a < b) { + i = (a + b) / 2; + if(!(c = wcscmp(event_info[i].name, str))) return i; + if(c > 0) b = i; + else a = i + 1; } return EVENTID_LAST; @@ -204,14 +209,18 @@ static eventid_t str_to_eid(const WCHAR *str) static eventid_t attr_to_eid(const WCHAR *str) { - int i; + unsigned i, a = 0, b = ARRAY_SIZE(event_info); + int c; if((str[0] != 'o' && str[0] != 'O') || (str[1] != 'n' && str[1] != 'N')) return EVENTID_LAST; - for(i=0; i < ARRAY_SIZE(event_info); i++) { - if(!wcscmp(event_info[i].name, str+2) && event_info[i].dispid) - return i; + while(a < b) { + i = (a + b) / 2; + if(!(c = wcscmp(event_info[i].name, str+2))) + return event_info[i].dispid ? i : EVENTID_LAST; + if(c > 0) b = i; + else a = i + 1; } return EVENTID_LAST; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 7f62bd69a7f..5d534512739 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -17,6 +17,7 @@ */ typedef enum { + EVENTID_DOMCONTENTLOADED, EVENTID_ABORT, EVENTID_ANIMATIONEND, EVENTID_ANIMATIONSTART, @@ -28,7 +29,6 @@ typedef enum { EVENTID_CONTEXTMENU, EVENTID_DATAAVAILABLE, EVENTID_DBLCLICK, - EVENTID_DOMCONTENTLOADED, EVENTID_DRAG, EVENTID_DRAGSTART, EVENTID_ERROR,

1 0

Gabriel Ivăncescu : mshtml: Implement timeout for XMLHttpRequest.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 105e6b83d3ad9d1572ed94c93a8ca62ae0d1f828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=105e6b83d3ad9d1572ed94c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed May 25 19:13:13 2022 +0300 mshtml: Implement timeout for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 2 + dlls/mshtml/tests/xmlhttprequest.c | 36 ++++++++++++ dlls/mshtml/xmlhttprequest.c | 116 +++++++++++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 930ab3bbe19..55742728923 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -265,6 +265,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLWindow6) \ XIID(IHTMLWindow7) \ XIID(IHTMLXMLHttpRequest) \ + XIID(IHTMLXMLHttpRequest2) \ XIID(IHTMLXMLHttpRequestFactory) \ XIID(IOmHistory) \ XIID(IOmNavigator) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5f104475f0d..8503523f927 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -397,6 +397,8 @@ sync_test("xhr_props", function() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); + test_exposed("ontimeout", true); + test_exposed("timeout", true); }); sync_test("stylesheet_props", function() { diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 868035d0419..6aef9f5a35d 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -1007,6 +1007,41 @@ static void test_xhr_post(IHTMLDocument2 *doc) xhr = NULL; } +static void test_timeout(IHTMLDocument2 *doc) +{ + IHTMLXMLHttpRequest2 *xhr2; + LONG timeout; + HRESULT hres; + + create_xmlhttprequest(doc); + if(!xhr) + return; + + hres = IHTMLXMLHttpRequest_QueryInterface(xhr, &IID_IHTMLXMLHttpRequest2, (void**)&xhr2); + ok(hres == S_OK, "QueryInterface(IHTMLXMLHttpRequest2) failed: %08lx\n", hres); + + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, NULL); + ok(hres == E_POINTER, "get_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, &timeout); + ok(hres == S_OK, "get_timeout returned %08lx\n", hres); + ok(timeout == 0, "timeout = %ld\n", timeout); + + /* Some Windows versions only allow setting timeout after open() */ + xhr_open(L"http://test.winehq.org/tests/post.php", L"POST", TRUE); + IHTMLXMLHttpRequest_Release(xhr); + xhr = NULL; + + hres = IHTMLXMLHttpRequest2_put_timeout(xhr2, -1); + ok(hres == E_INVALIDARG || broken(hres == E_FAIL), "put_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_put_timeout(xhr2, 1337); + ok(hres == S_OK, "put_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, &timeout); + ok(hres == S_OK, "get_timeout returned %08lx\n", hres); + ok(timeout == 1337, "timeout = %ld\n", timeout); + + IHTMLXMLHttpRequest2_Release(xhr2); +} + static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) { BSTR url; @@ -1071,6 +1106,7 @@ START_TEST(xmlhttprequest) test_async_xhr(doc, large_page_url, NULL); test_async_xhr_abort(doc, large_page_url); test_xhr_post(doc); + test_timeout(doc); IHTMLDocument2_Release(doc); } SysFreeString(content_type); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 17219593026..066b94ba5e7 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -105,6 +105,7 @@ typedef struct { struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; + IHTMLXMLHttpRequest2 IHTMLXMLHttpRequest2_iface; IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; nsIXMLHttpRequest *nsxhr; @@ -236,6 +237,8 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa *ppv = &This->IHTMLXMLHttpRequest_iface; }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest, riid)) { *ppv = &This->IHTMLXMLHttpRequest_iface; + }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest2, riid)) { + *ppv = &This->IHTMLXMLHttpRequest2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { *ppv = &This->IProvideClassInfo2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { @@ -726,6 +729,117 @@ static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = { HTMLXMLHttpRequest_setRequestHeader }; +static inline HTMLXMLHttpRequest *impl_from_IHTMLXMLHttpRequest2(IHTMLXMLHttpRequest2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IHTMLXMLHttpRequest2_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_QueryInterface(IHTMLXMLHttpRequest2 *iface, REFIID riid, void **ppv) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_QueryInterface(&This->IHTMLXMLHttpRequest_iface, riid, ppv); +} + +static ULONG WINAPI HTMLXMLHttpRequest2_AddRef(IHTMLXMLHttpRequest2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_AddRef(&This->IHTMLXMLHttpRequest_iface); +} + +static ULONG WINAPI HTMLXMLHttpRequest2_Release(IHTMLXMLHttpRequest2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_Release(&This->IHTMLXMLHttpRequest_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetTypeInfoCount(IHTMLXMLHttpRequest2 *iface, UINT *pctinfo) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetTypeInfo(IHTMLXMLHttpRequest2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetIDsOfNames(IHTMLXMLHttpRequest2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_Invoke(IHTMLXMLHttpRequest2 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_put_timeout(IHTMLXMLHttpRequest2 *iface, LONG v) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + TRACE("(%p)->(%ld)\n", This, v); + + if(v < 0) + return E_INVALIDARG; + return map_nsresult(nsIXMLHttpRequest_SetTimeout(This->nsxhr, v)); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_get_timeout(IHTMLXMLHttpRequest2 *iface, LONG *p) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + nsresult nsres; + UINT32 timeout; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsres = nsIXMLHttpRequest_GetTimeout(This->nsxhr, &timeout); + *p = timeout; + return map_nsresult(nsres); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_put_ontimeout(IHTMLXMLHttpRequest2 *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_get_ontimeout(IHTMLXMLHttpRequest2 *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static const IHTMLXMLHttpRequest2Vtbl HTMLXMLHttpRequest2Vtbl = { + HTMLXMLHttpRequest2_QueryInterface, + HTMLXMLHttpRequest2_AddRef, + HTMLXMLHttpRequest2_Release, + HTMLXMLHttpRequest2_GetTypeInfoCount, + HTMLXMLHttpRequest2_GetTypeInfo, + HTMLXMLHttpRequest2_GetIDsOfNames, + HTMLXMLHttpRequest2_Invoke, + HTMLXMLHttpRequest2_put_timeout, + HTMLXMLHttpRequest2_get_timeout, + HTMLXMLHttpRequest2_put_ontimeout, + HTMLXMLHttpRequest2_get_ontimeout +}; + static inline HTMLXMLHttpRequest *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IProvideClassInfo2_iface); @@ -895,6 +1009,7 @@ static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { }; static const tid_t HTMLXMLHttpRequest_iface_tids[] = { + IHTMLXMLHttpRequest2_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { @@ -1013,6 +1128,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->nsxhr = nsxhr; ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; + ret->IHTMLXMLHttpRequest2_iface.lpVtbl = &HTMLXMLHttpRequest2Vtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex, This->window->doc->document_mode);

1 0

Jacek Caban : winemac: Don't use MultiByteToWideChar in macdrv_GetKeyNameText.
by Alexandre Julliard 25 May '22

25 May '22

Module: wine Branch: master Commit: 916a7487232d0401dbfa7b42de6049b7540b868c URL: https://source.winehq.org/git/wine.git/?a=commit;h=916a7487232d0401dbfa7b42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 15:06:43 2022 +0200 winemac: Don't use MultiByteToWideChar in macdrv_GetKeyNameText. Also fixes null termination tests in test_key_names. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/keyboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index d3e9dca9055..08c76eb1389 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1257,8 +1257,9 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) { if (vkey_names[i].vkey == vkey) { - len = MultiByteToWideChar(CP_UTF8, 0, vkey_names[i].name, -1, buffer, size); - if (len) len--; + len = min(strlen(vkey_names[i].name) + 1, size); + ascii_to_unicode(buffer, vkey_names[i].name, len); + if (len) buffer[--len] = 0; break; } }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022