October 2019 - Wine-devel - list.winehq.org

[PATCH v2] webservices: Fix some leaks on error paths (Coverity).
by Hans Leidekker 21 Oct '19

21 Oct '19

From: Sven Baars <sven.wine(a)gmail.com> v2: Fix size passed to ws_free(). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/msg.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index a006841be6..6922224a05 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1552,12 +1552,12 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na return hr; } -static HRESULT xmlstring_to_wsz( const WS_XML_STRING *str, WS_HEAP *heap, WCHAR **ret ) +static HRESULT xmlstring_to_wsz( const WS_XML_STRING *str, WS_HEAP *heap, WCHAR **ret, int *len ) { - int len = MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, NULL, 0 ); - if (!(*ret = ws_alloc( heap, (len + 1) * sizeof(WCHAR) ))) return WS_E_QUOTA_EXCEEDED; - MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, *ret, len ); - (*ret)[len] = 0; + *len = MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, NULL, 0 ); + if (!(*ret = ws_alloc( heap, (*len + 1) * sizeof(WCHAR) ))) return WS_E_QUOTA_EXCEEDED; + MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, *ret, *len ); + (*ret)[*len] = 0; return S_OK; } @@ -1565,9 +1565,10 @@ static HRESULT get_header_value_wsz( struct header *header, WS_READ_OPTION optio ULONG size ) { WCHAR *str = NULL; + int len = 0; HRESULT hr; - if (header && (hr = xmlstring_to_wsz( header->u.text, heap, &str )) != S_OK) return hr; + if (header && (hr = xmlstring_to_wsz( header->u.text, heap, &str, &len )) != S_OK) return hr; switch (option) { @@ -1577,12 +1578,17 @@ static HRESULT get_header_value_wsz( struct header *header, WS_READ_OPTION optio case WS_READ_OPTIONAL_POINTER: case WS_READ_NILLABLE_POINTER: - if (size != sizeof(str)) return E_INVALIDARG; + if (size != sizeof(str)) + { + ws_free( heap, str, (len + 1) * sizeof(WCHAR) ); + return E_INVALIDARG; + } *ret = str; break; default: FIXME( "read option %u not supported\n", option ); + ws_free( heap, str, (len + 1) * sizeof(WCHAR) ); return E_NOTIMPL; } -- 2.20.1

1 0

[PATCH] mshtml/tests: Fix the name of an unused function parameter.
by Francois Gouget 21 Oct '19

21 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d13381aa0ab..4b55fdd0c8e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1672,7 +1672,7 @@ static ULONG WINAPI OleContainer_Release(IOleContainer *iface) } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, - LPOLESTR pszDiaplayName, ULONG *pchEaten, IMoniker **ppmkOut) + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { ok(0, "unexpected call\n"); return E_NOTIMPL; -- 2.20.1

3 2

[PATCH] mshtml/tests: Fix the spelling of an ok() message.
by Francois Gouget 21 Oct '19

21 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/tests/protocol.c | 6 +++--- dlls/mshtml/tests/style.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 80e356344d3..8f37d09c555 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -640,7 +640,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(blank_html), "cb=%d\n", cb); - ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, blank_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); @@ -650,7 +650,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(test_html), "cb=%d\n", cb); - ok(!memcmp(buf, test_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, test_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); @@ -660,7 +660,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(blank_html), "cb=%d\n", cb); - ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, blank_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 52a3a5ccdff..37a14262701 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2719,7 +2719,7 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderTopColor(style, &v); ok(hres == S_OK, "get_borderTopColor: %08x\n", hres); - ok(!strcmp_wa(V_BSTR(&v), "red"), "expecte red = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!strcmp_wa(V_BSTR(&v), "red"), "expected red = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderTopColor(style, vDefault); -- 2.20.1

3 2

[PATCH] mshtml: Fix the spelling of some variable and field names.
by Francois Gouget 21 Oct '19

21 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/navigate.c | 10 +++++----- dlls/mshtml/script.c | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index accf468a25c..9926fa0dc33 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -80,7 +80,7 @@ struct BSCallback { LONG ref; request_data_t request_data; - ULONG readed; + ULONG read; DWORD bindf; DWORD bindinfo_options; BOOL bindinfo_ready; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 193b4fe37ca..744db468d83 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -690,7 +690,7 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW hres = IStream_Read(stream, buf, size, &read_size); - if(!This->readed && This->bom == BOM_NONE) { + if(!This->read && This->bom == BOM_NONE) { if(read_size >= 2 && data[0] == 0xff && data[1] == 0xfe) { This->bom = BOM_UTF16; skip = 2; @@ -705,7 +705,7 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW } } - This->readed += read_size; + This->read += read_size; *ret_size = read_size; return hres; } @@ -1092,7 +1092,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) } do { - BOOL first_read = !This->bsc.readed; + BOOL first_read = !This->bsc.read; hres = read_stream(&This->bsc, stream, This->nsstream->buf+This->nsstream->buf_size, sizeof(This->nsstream->buf)-This->nsstream->buf_size, &read); @@ -1135,7 +1135,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) nsres = nsIStreamListener_OnDataAvailable(This->nslistener, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, - &This->nsstream->nsIInputStream_iface, This->bsc.readed-This->nsstream->buf_size, + &This->nsstream->nsIInputStream_iface, This->bsc.read-This->nsstream->buf_size, This->nsstream->buf_size); if(NS_FAILED(nsres)) ERR("OnDataAvailable failed: %08x\n", nsres); @@ -1365,7 +1365,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) { stop_request_task_t *task; - if(!This->bsc.readed) { + if(!This->bsc.read) { TRACE("No data read, calling OnStartRequest\n"); on_start_nsrequest(This); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index e337b1c900a..6f06d3b0919 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -824,7 +824,7 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) UINT cp = CP_UTF8; WCHAR *text; - if(!bsc->bsc.readed) { + if(!bsc->bsc.read) { text = heap_alloc(sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; @@ -835,17 +835,17 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) switch(bsc->bsc.bom) { case BOM_UTF16: - if(bsc->bsc.readed % sizeof(WCHAR)) { + if(bsc->bsc.read % sizeof(WCHAR)) { FIXME("The buffer is not a valid utf16 string\n"); return E_FAIL; } - text = heap_alloc(bsc->bsc.readed+sizeof(WCHAR)); + text = heap_alloc(bsc->bsc.read+sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; - memcpy(text, bsc->buf, bsc->bsc.readed); - text[bsc->bsc.readed/sizeof(WCHAR)] = 0; + memcpy(text, bsc->buf, bsc->bsc.read); + text[bsc->bsc.read/sizeof(WCHAR)] = 0; break; default: @@ -855,12 +855,12 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) case BOM_UTF8: { DWORD len; - len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.read, NULL, 0); text = heap_alloc((len+1)*sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; - MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); + MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.read, text, len); text[len] = 0; } } @@ -988,7 +988,7 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) { ScriptBSC *This = impl_from_BSCallback(bsc); - DWORD readed; + DWORD read; HRESULT hres; if(!This->buf) { @@ -999,7 +999,7 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) } do { - if(This->bsc.readed >= This->size) { + if(This->bsc.read >= This->size) { void *new_buf; new_buf = heap_realloc(This->buf, This->size << 1); if(!new_buf) @@ -1008,7 +1008,7 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) This->buf = new_buf; } - hres = read_stream(&This->bsc, stream, This->buf+This->bsc.readed, This->size-This->bsc.readed, &readed); + hres = read_stream(&This->bsc, stream, This->buf+This->bsc.read, This->size-This->bsc.read, &read); }while(hres == S_OK); return S_OK; -- 2.20.1

2 1

[PATCH v4 0/8] winex11.drv: Improve ClipCursor handling.
by Rémi Bernon 21 Oct '19

21 Oct '19

Yet another attempt at making things better. This uses a simpler delaying method than the previous implementations, by resending delayed FocusIn/WM_TAKE_FOCUS events to the window so it reprocesses it a bit later and retry grabbing the pointer until it succeeds. Rémi Bernon (8): Revert "winex11.drv: Retry last ClipCursor when grab is released." Revert "winex11.drv: Only grab or warp the cursor when keyboard isn't grabbed." winex11.drv: Merge FocusIn/FocusOut NotifyGrab/NotifyUngrab cases. winex11.drv: Pass XEvent instead of XClientMessageEvent to handlers. winex11.drv: Wait for pointer grab on FocusIn/WM_TAKE_FOCUS events. winex11.drv: Release pointer grab on focus change. winex11.drv: Release pointer grab on FocusOut events. winex11.drv: Restore pointer grab on FocusIn events. dlls/winex11.drv/event.c | 118 ++++++++++++++++++++------------------ dlls/winex11.drv/mouse.c | 36 ------------ dlls/winex11.drv/window.c | 3 + dlls/winex11.drv/x11drv.h | 13 ++--- dlls/winex11.drv/xdnd.c | 11 ++-- 5 files changed, 78 insertions(+), 103 deletions(-) -- 2.23.0

1 8

[PATCH] comctl32/tests: Avoid an unneeded lstrlenW() call.
by Francois Gouget 21 Oct '19

21 Oct '19

Note that buffer_w is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index dd05a98d2dd..14071b2ecd0 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1166,7 +1166,7 @@ static void test_note(void) size = ARRAY_SIZE(buffer_w); ret = SendMessageA(hwnd, BCM_GETNOTE, (WPARAM)&size, (LPARAM)buffer_w); ok(ret, "Expect BCM_GETNOTE return true\n"); - ok(lstrlenW(buffer_w) == 0, "Expect note length 0\n"); + ok(!*buffer_w, "Expect note length 0\n"); ok(size == ARRAY_SIZE(buffer_w), "Got: %d\n", size); error = GetLastError(); ok(error == NO_ERROR, "Expect last error: 0x%08x, got: 0x%08x\n", NO_ERROR, error); -- 2.20.1

2 1

[PATCH] advapi32: Remove unnecessary inclusion of sys/stat.h
by Alex Henrie 21 Oct '19

21 Oct '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Nothing in this file uses stat. --- dlls/advapi32/crypt.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385299..1e91bf7a44 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -32,9 +32,6 @@ #include <stdlib.h> #include <stdio.h> #include <sys/types.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif #include <fcntl.h> #ifdef HAVE_UNISTD_H # include <unistd.h> -- 2.23.0

1 0

[PATCH 5/5] msi/tests: Fix the case of an ok() message.
by Francois Gouget 21 Oct '19

21 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msi/tests/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 6cb52cf04dc..88d8180a50c 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1771,7 +1771,7 @@ static void test_formatrecord_package(void) ok( 0 == strcmp(buffer,"1: 2: 3: 4: 5: 6: 7: 8: 9: 10: 11: 12: "), "wrong output(%s)\n",buffer); r = MsiSetPropertyA(package, "prop", "val"); - ok( r == ERROR_SUCCESS, "failed to set propertY: %d\n", r); + ok( r == ERROR_SUCCESS, "failed to set property: %d\n", r); r = MsiRecordSetStringA(hrec, 0, NULL); ok( r == ERROR_SUCCESS, "set string failed\n"); -- 2.20.1

1 0

[PATCH] include: Set threading model on UIAnimation* interfaces.
by Alistair Leslie-Hughes 21 Oct '19

21 Oct '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/uianimation.idl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/uianimation.idl b/include/uianimation.idl index 631af11899..70c710cdf8 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -585,7 +585,8 @@ interface IUIAnimationTransitionLibrary : IUnknown library UIAnimation { [ - uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e) + uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e), + threading(both) ] coclass UIAnimationTimer { @@ -593,7 +594,8 @@ library UIAnimation } [ - uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8) + uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8), + threading(both) ] coclass UIAnimationManager { @@ -601,7 +603,8 @@ library UIAnimation } [ - uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887) + uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887), + threading(both) ] coclass UIAnimationTransitionFactory { @@ -609,7 +612,8 @@ library UIAnimation } [ - uuid(1d6322ad-aa85-4ef5-a828-86d71067d145) + uuid(1d6322ad-aa85-4ef5-a828-86d71067d145), + threading(both) ] coclass UIAnimationTransitionLibrary { -- 2.17.1

1 0

[PATCH v3] oledb32: Support Milliseconds when converting BSTR -> DBTIMESTAMP
by Alistair Leslie-Hughes 21 Oct '19

21 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- Here is a simplier way without convert to ascii first. dlls/oledb32/convert.c | 12 ++++++++++++ dlls/oledb32/tests/convert.c | 25 +++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a5bbdbc245..2fc65c7403 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -566,6 +566,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + if(swscanf( s, L"%d-%d-%d %d:%d:%d.%d", &d->year, &d->month, &d->day, &d->hour, &d->minute, + &d->second, &d->fraction) != 7) + { + hr = DISP_E_TYPEMISMATCH; + *dst_status = DBSTATUS_E_CANTCONVERTVALUE; + *dst_len = get_length(dst_type); + } + else + hr = S_OK; + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 51fd2f7fa3..28401e68c9 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3953,10 +3953,27 @@ static void test_converttotimestamp(void) bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(L"2013-05-14 02:04:12.017000000"); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(L"2013/05/14 02:04:12.01700"); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DISP_E_TYPEMISMATCH, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); SysFreeString(bstr); V_VT(&var) = VT_NULL; -- 2.17.1

1 0