October 2021 - Wine-commits

Gabriel Ivăncescu : mshtml: Add names for each object and use it in the Navigator.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: c667bbe80aa08514d1197a92acf402c3dc80b211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c667bbe80aa08514d1197a92… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Oct 6 18:11:31 2021 +0300 mshtml: Add names for each object and use it in the Navigator. 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/dispex.c | 29 +++++++++++++++++++++++++++++ dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlarea.c | 1 + dlls/mshtml/htmlattr.c | 1 + dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmlcurstyle.c | 1 + dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlelem.c | 6 ++++++ dlls/mshtml/htmlelemcol.c | 1 + dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 2 ++ dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 4 ++++ dlls/mshtml/htmlimg.c | 2 ++ dlls/mshtml/htmlinput.c | 3 +++ dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmllocation.c | 1 + dlls/mshtml/htmlnode.c | 2 ++ dlls/mshtml/htmlobject.c | 2 ++ dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 3 +++ dlls/mshtml/htmlstorage.c | 1 + dlls/mshtml/htmlstyle.c | 2 ++ dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmlstylesheet.c | 4 ++++ dlls/mshtml/htmltable.c | 3 +++ dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextnode.c | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/omnavigator.c | 18 ++++++++++++------ dlls/mshtml/range.c | 2 ++ dlls/mshtml/selection.c | 1 + dlls/mshtml/xmlhttprequest.c | 2 ++ 36 files changed, 106 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c667bbe80aa08514d119…

1 0

Gabriel Ivăncescu : mshtml: Use dispex_to_string when retrieving the value of an object.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: d9eb90e6ab7989868ef613f6104c22004918b396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9eb90e6ab7989868ef613f6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Oct 6 18:11:33 2021 +0300 mshtml: Use dispex_to_string when retrieving the value of an object. Rather than always returning "[object]" in every mode. 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/dispex.c | 14 ++++++++------ dlls/mshtml/tests/dom.c | 6 +++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 1adcc675681..96a776d9594 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -715,15 +715,17 @@ HRESULT dispex_get_dynid(DispatchEx *This, const WCHAR *name, DISPID *id) static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { + HRESULT hres; + if(This->info->desc->vtbl && This->info->desc->vtbl->value) return This->info->desc->vtbl->value(This, lcid, flags, params, res, ei, caller); switch(flags) { case DISPATCH_PROPERTYGET: V_VT(res) = VT_BSTR; - V_BSTR(res) = SysAllocString(L"[object]"); - if(!V_BSTR(res)) - return E_OUTOFMEMORY; + hres = dispex_to_string(This, &V_BSTR(res)); + if(FAILED(hres)) + return hres; break; default: FIXME("Unimplemented flags %x\n", flags); @@ -1305,9 +1307,9 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, if(func->id == DISPID_VALUE) { BSTR ret; - ret = SysAllocString(L"[object]"); - if(!ret) - return E_OUTOFMEMORY; + hres = dispex_to_string(This, &ret); + if(FAILED(hres)) + return hres; V_VT(res) = VT_BSTR; V_BSTR(res) = ret; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3bae9e08225..9daaf9de51d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -107,7 +107,11 @@ static const char noscript_str[] = "<body><noscript><div>test</div></noscript></body></html>"; static const char doctype_str[] = "<!DOCTYPE html>" - "<html><head><title>emptydiv test</title></head>" + "<html>" + " <head>" + " <meta http-equiv=\"x-ua-compatible\" content=\"IE=8\" />" + " <title>emptydiv test</title>" + " </head>" "<body><div id=\"divid\"></div></body></html>"; static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0};

1 0

Gabriel Ivăncescu : mshtml: Use proper compat mode for HTMLDOMAttribute.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 240e0d1d7c1c77d8ff3ded596577e8a51c6cfd81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240e0d1d7c1c77d8ff3ded59… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Oct 6 18:11:35 2021 +0300 mshtml: Use proper compat mode for HTMLDOMAttribute. 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/htmlattr.c | 3 +-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index e10c7c3826f..e4c98d9af06 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -495,9 +495,8 @@ HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) return iface->lpVtbl == &HTMLDOMAttributeVtbl ? impl_from_IHTMLDOMAttribute(iface) : NULL; } -HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) +HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, compat_mode_t compat_mode, HTMLDOMAttribute **attr) { - compat_mode_t compat_mode = elem ? dispex_compat_mode(&elem->node.event_target.dispex) : COMPAT_MODE_QUIRKS; HTMLAttributeCollection *col; HTMLDOMAttribute *ret; HRESULT hres; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6bbf058aed4..12fce6d3015 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2856,7 +2856,7 @@ static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); - hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, &attr); + hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, dispex_compat_mode(&This->doc_node->node.event_target.dispex), &attr); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cb7a528be39..dada4de9ab7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7251,7 +7251,7 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG return E_UNEXPECTED; } - hres = HTMLDOMAttribute_Create(NULL, This->elem, id, attr); + hres = HTMLDOMAttribute_Create(NULL, This->elem, id, dispex_compat_mode(&This->elem->node.event_target.dispex), attr); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9429a4bb5b4..6ee510572e6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1090,7 +1090,7 @@ typedef struct { HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute*) DECLSPEC_HIDDEN; -HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; +HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,compat_mode_t,HTMLDOMAttribute**) DECLSPEC_HIDDEN; HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : winegstreamer: Handle zero-length reads in src_getrange_cb().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 8e9d7b031f7b0c93471cfbffe8f720c34623a273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e9d7b031f7b0c93471cfbff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:32 2021 -0500 winegstreamer: Handle zero-length reads in src_getrange_cb(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 72dfab8f3d6..9a382cb724c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1272,7 +1272,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, GstMapInfo map_info; bool ret; - GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); if (offset == GST_BUFFER_OFFSET_NONE) offset = parser->next_pull_offset; @@ -1281,6 +1281,16 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); + if (!size) + { + /* asfreader occasionally asks for zero bytes. gst_buffer_map() will + * return NULL in this case. Avoid confusing the read thread by asking + * it for zero bytes. */ + gst_buffer_set_size(*buffer, 0); + GST_LOG("Returning empty buffer."); + return GST_FLOW_OK; + } + gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); pthread_mutex_lock(&parser->mutex);

1 0

Zebediah Figura : winegstreamer: Use array_reserve() to reallocate read buffers.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 59997c355fdc9cb5857c767b3bf16c9513b3d1f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59997c355fdc9cb5857c767b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:33 2021 -0500 winegstreamer: Use array_reserve() to reallocate read buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/main.c | 27 +++++++++++++++++++++++++++ dlls/winegstreamer/media_source.c | 8 ++++---- dlls/winegstreamer/quartz_parser.c | 8 ++++---- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index ebe0bf6f50d..986c8ca695d 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -38,6 +38,8 @@ #include "unixlib.h" +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN; + static inline const char *debugstr_time(REFERENCE_TIME time) { ULONGLONG abstime = time >= 0 ? time : -time; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index c799aa06d1b..d6f19fb4ad1 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -31,6 +31,33 @@ static unixlib_handle_t unix_handle; WINE_DEFAULT_DEBUG_CHANNEL(quartz); +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + unsigned int new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) { struct wg_parser_create_params params = diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index da898f20f66..703bdd7c57d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -613,7 +613,7 @@ static DWORD CALLBACK read_thread(void *arg) { struct media_source *source = arg; IMFByteStream *byte_stream = source->byte_stream; - uint32_t buffer_size = 0; + size_t buffer_size = 0; uint64_t file_size; void *data = NULL; @@ -636,10 +636,10 @@ static DWORD CALLBACK read_thread(void *arg) else if (offset + size >= file_size) size = file_size - offset; - if (size > buffer_size) + if (!array_reserve(&data, &buffer_size, size, 1)) { - buffer_size = size; - data = realloc(data, size); + free(data); + return 0; } ret_size = 0; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 6ae1a99a14a..b6655d5da3c 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -786,7 +786,7 @@ static DWORD CALLBACK read_thread(void *arg) { struct parser *filter = arg; LONGLONG file_size, unused; - uint32_t buffer_size = 0; + size_t buffer_size = 0; void *data = NULL; IAsyncReader_Length(filter->reader, &file_size, &unused); @@ -807,10 +807,10 @@ static DWORD CALLBACK read_thread(void *arg) else if (offset + size >= file_size) size = file_size - offset; - if (size > buffer_size) + if (!array_reserve(&data, &buffer_size, size, 1)) { - buffer_size = size; - data = realloc(data, size); + free(data); + return 0; } hr = IAsyncReader_SyncRead(filter->reader, offset, size, data);

1 0

Zebediah Figura : winegstreamer: Avoid passing a NULL buffer to wg_parser_push_data() in the case of a zero-length read.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 585acfa04188f85fb9138e57d56dd44b870dca41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=585acfa04188f85fb9138e57… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:34 2021 -0500 winegstreamer: Avoid passing a NULL buffer to wg_parser_push_data() in the case of a zero-length read. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 7 +++++-- dlls/winegstreamer/quartz_parser.c | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 703bdd7c57d..dab85e4689d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -613,9 +613,12 @@ static DWORD CALLBACK read_thread(void *arg) { struct media_source *source = arg; IMFByteStream *byte_stream = source->byte_stream; - size_t buffer_size = 0; + size_t buffer_size = 4096; uint64_t file_size; - void *data = NULL; + void *data; + + if (!(data = malloc(buffer_size))) + return 0; IMFByteStream_GetLength(byte_stream, &file_size); diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index b6655d5da3c..6d79d2ef129 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -786,9 +786,12 @@ static DWORD CALLBACK read_thread(void *arg) { struct parser *filter = arg; LONGLONG file_size, unused; - size_t buffer_size = 0; + size_t buffer_size = 4096; void *data = NULL; + if (!(data = malloc(buffer_size))) + return 0; + IAsyncReader_Length(filter->reader, &file_size, &unused); TRACE("Starting read thread for filter %p.\n", filter);

1 0

Zebediah Figura : winegstreamer: Avoid seeking past the end of an IMFByteStream.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 3efb72de5aca01d3d979ce697728e51bc3e99901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3efb72de5aca01d3d979ce69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:35 2021 -0500 winegstreamer: Avoid seeking past the end of an IMFByteStream. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51837 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index dab85e4689d..6ecd345cb73 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -639,6 +639,14 @@ static DWORD CALLBACK read_thread(void *arg) else if (offset + size >= file_size) size = file_size - offset; + /* Some IMFByteStreams (including the standard file-based stream) return + * an error when reading past the file size. */ + if (!size) + { + wg_parser_push_data(source->wg_parser, data, 0); + continue; + } + if (!array_reserve(&data, &buffer_size, size, 1)) { free(data);

1 0

Zebediah Figura : winegstreamer: Trace the unfiltered caps in sink_query_cb().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: fd6315eb8f6809b89b7449f4b9dd01453de32eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd6315eb8f6809b89b7449f4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:36 2021 -0500 winegstreamer: Trace the unfiltered caps in sink_query_cb(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 9a382cb724c..0c23ae6d351 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1006,6 +1006,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) case GST_QUERY_CAPS: { GstCaps *caps, *filter, *temp; + gchar *str; gst_query_parse_caps(query, &filter); @@ -1016,6 +1017,10 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) if (!caps) return FALSE; + str = gst_caps_to_string(caps); + GST_LOG("Stream caps are \"%s\".", str); + g_free(str); + if (filter) { temp = gst_caps_intersect(caps, filter);

1 0

Huw Davies : iphlpapi: Stop using USE_WS_PREFIX.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: da81d63f6f10149d89f34f1306c5c39e09b202d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da81d63f6f10149d89f34f13… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:55 2021 +0100 iphlpapi: Stop using USE_WS_PREFIX. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 231 +++++++++++++++++++----------------------- 1 file changed, 105 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da81d63f6f10149d89f3…

1 0

Huw Davies : iphlpapi: Implement IcmpParseReplies().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: f6ca752201b191326ce837edeae56792b5c23044 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ca752201b191326ce837ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:56 2021 +0100 iphlpapi: Implement IcmpParseReplies(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 49 ++++++++++++++++++++++++++++++------------ 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 6c51548b6e3..ce188084c01 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -157,7 +157,7 @@ @ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() -@ stub IcmpParseReplies +@ stdcall IcmpParseReplies(ptr long) @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d52441f022a..9e525a2116c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2,6 +2,7 @@ * iphlpapi dll implementation * * Copyright (C) 2003,2006 Juan Lang + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4541,3 +4542,16 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, return ERROR_INVALID_PARAMETER; } + +/****************************************************************** + * IcmpParseReplies (IPHLPAPI.@) + */ +DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) +{ + ICMP_ECHO_REPLY *icmp_reply = reply; + DWORD num_pkts = icmp_reply->Reserved; + + icmp_reply->Reserved = 0; + if (!num_pkts) SetLastError( icmp_reply->Status ); + return num_pkts; +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 223d6d270cb..080feb364f9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1043,20 +1043,40 @@ static void testIcmpSendEcho(void) IcmpCloseHandle(icmp); } -/* -still-to-be-tested NT4-onward functions: -CreateIpForwardEntry -DeleteIpForwardEntry -CreateIpNetEntry -DeleteIpNetEntry -GetFriendlyIfIndex -GetRTTAndHopCount -SetIfEntry -SetIpForwardEntry -SetIpNetEntry -SetIpStatistics -SetIpTTL -*/ +static void testIcmpParseReplies( void ) +{ + ICMP_ECHO_REPLY reply = { 0 }; + DWORD ret; + + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 0, "gle %d\n", GetLastError() ); + + reply.Status = 12345; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 12345, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + + reply.Reserved = 1; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 1, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); + + reply.Reserved = 3; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 3, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); +} + static void testWinNT4Functions(void) { testGetNumberOfInterfaces(); @@ -1076,6 +1096,7 @@ static void testWinNT4Functions(void) testGetUdpTable(); testSetTcpEntry(); testIcmpSendEcho(); + testIcmpParseReplies(); } static void testGetInterfaceInfo(void)

1 0