January 2018 - Wine-Commits

Francois Gouget : ole32: Rename entry_updatable() to its more common spelling.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 5fd5618e3d334551defa35cba365b14edb55038f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd5618e3d334551defa35cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:55:48 2018 +0100 ole32: Rename entry_updatable() to its more common spelling. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ad55c6e..4ba0826 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2562,7 +2562,7 @@ static HRESULT WINAPI DataCache_IOleCache2_SetData( return OLE_E_BLANK; } -static BOOL entry_updateable( DataCacheEntry *entry, DWORD mode ) +static BOOL entry_updatable( DataCacheEntry *entry, DWORD mode ) { BOOL is_blank = entry->stgmedium.tymed == TYMED_NULL; @@ -2595,7 +2595,7 @@ static HRESULT WINAPI DataCache_UpdateCache( IOleCache2 *iface, IDataObject *dat { slots++; - if (!entry_updateable( cache_entry, mode )) + if (!entry_updatable( cache_entry, mode )) { done_one = TRUE; continue;

1 0

Francois Gouget : mshtml/tests: Fix typos in a few comments.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 325f438a41cf0c0621c7a72129dd80865991aa1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=325f438a41cf0c0621c7a721… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:57:22 2018 +0100 mshtml/tests: Fix typos in a few comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 2 +- dlls/mshtml/tests/events.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index f20fd3b..39860ff 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -266,7 +266,7 @@ function test_attach_in_attach() { calls += "div.onclick,"; div.attachEvent("onclick", function() { calls += "div.click,"; - /* listener attached inside an other attached listener will not ve invoked */ + /* listener attached inside another attached listener will not be invoked */ div.attachEvent("onclick", function () { ok(false, "unexpected call"); }); }); } diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index f7df4d8..f471b86 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -405,7 +405,7 @@ function test_init_event() { ok(e.target === elem, "target != elem"); ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); - /* initEvent no longer has effect except reseting defaultPrevented */ + /* initEvent no longer has any effect except resetting defaultPrevented */ e.initEvent("test", true, false); ok(e.type === "NewTest", "type = " + e.type); ok(e.bubbles === false, "bubbles = " + e.bubbles);

1 0

Nikolay Sivov : mshtml/tests: Test document stream creation failure ( Coverity).
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 286174a5ac2d5901e2970844aeb120c973e7e1ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=286174a5ac2d5901e2970844… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 5 14:38:56 2018 +0300 mshtml/tests: Test document stream creation failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/activex.c | 7 +++++-- dlls/mshtml/tests/dom.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 78602b7..8b6a47c 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2246,6 +2246,7 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) IStream *stream; HGLOBAL mem; SIZE_T len; + HRESULT hr; notif_doc = doc; @@ -2253,9 +2254,11 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hr = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6c0b637..b003467 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10518,6 +10518,7 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) IHTMLDocument2 *doc; HGLOBAL mem; SIZE_T len; + HRESULT hr; notif_doc = doc = create_document(); if(!doc) @@ -10527,9 +10528,11 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hr = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init);

1 0

Alex Henrie : gameux/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 85d970b7c86617164ec6ec55802cf5f13734477e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d970b7c86617164ec6ec55… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 4 22:01:48 2018 -0700 gameux/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 1ef7a78..05c2a11 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -454,7 +454,7 @@ static void _findGameInstanceId(int line, ++dwMaxSubKeyLen; /* for string terminator */ lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); if(!lpName) hr = E_OUTOFMEMORY; - ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name"); + ok_(__FILE__, line)(SUCCEEDED(hr), "cannot allocate memory for key name\n"); } if(SUCCEEDED(hr))

1 0

Alexandre Julliard : ntdll: Fix source/destination confusion in vsscanf.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 62a1410a07476ac94acceaf2a9e65628d4b06ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a1410a07476ac94acceaf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 16:09:30 2018 +0100 ntdll: Fix source/destination confusion in vsscanf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index eb762c6..c349add 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1178,19 +1178,19 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) else goto widecharacter; character: { /* read single character into char */ - char *str = suppress ? NULL : va_arg( ap, char * ); - char *pstr = str; + char *sptr = suppress ? NULL : va_arg( ap, char * ); + char *sptr_beg = sptr; unsigned size = UINT_MAX; if (width == -1) width = 1; while (width && nch != '\0') { if (!suppress) { - *str++ = nch; + *sptr++ = nch; if(size) size--; else { - *pstr = 0; + *sptr_beg = 0; return rd; } } @@ -1202,19 +1202,19 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) break; widecharacter: { /* read single character into a WCHAR */ - WCHAR *str = suppress ? NULL : va_arg( ap, WCHAR * ); - WCHAR *pstr = str; + WCHAR *sptr = suppress ? NULL : va_arg( ap, WCHAR * ); + WCHAR *sptr_beg = sptr; unsigned size = UINT_MAX; if (width == -1) width = 1; while (width && nch != '\0') { if (!suppress) { - *str++ = nch; + *sptr++ = nch; if (size) size--; else { - *pstr = 0; + *sptr_beg = 0; return rd; } } @@ -1248,10 +1248,10 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) break; case '[': { - char *str = suppress ? NULL : va_arg( ap, char * ); - char *sptr = str; + char *sptr = suppress ? NULL : va_arg( ap, char * ); + char *sptr_beg = sptr; RTL_BITMAP bitMask; - ULONG Mask[8]; + ULONG Mask[8] = { 0 }; BOOLEAN invert = FALSE; /* Set if we are NOT to find the chars */ unsigned size = UINT_MAX; @@ -1312,7 +1312,7 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) if(size > 1) size--; else { - *str = 0; + if (!suppress) *sptr_beg = 0; return rd; } }

1 0

Louis Lenders : wtsapi32: Fix copy/paste error in comment.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 0bdd879fde17ded68f03502ae2ff44e14176fabb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bdd879fde17ded68f03502a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jan 4 10:10:00 2018 +0100 wtsapi32: Fix copy/paste error in comment. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c668604..aeb4b65 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -277,7 +277,7 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) } /************************************************************ - * WTSRegisterSessionNotification (WTSAPI32.@) + * WTSRegisterSessionNotificationEx (WTSAPI32.@) */ BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) {

1 0

Nikolay Sivov : mshtml/tests: Remove null check after dereference ( Coverity).
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 53b73055b73fd107b8f479ae509a7f8155c516f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b73055b73fd107b8f479ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 5 14:38:57 2018 +0300 mshtml/tests: Remove null check after dereference (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 908e647..685bfc1 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2578,7 +2578,7 @@ static IHTMLWindow2 *get_iframe_window(IHTMLIFrameElement *iframe) ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); ok(window != NULL, "window == NULL\n"); - if(base) IHTMLFrameBase2_Release(base); + IHTMLFrameBase2_Release(base); return window; }

1 0

Francois Gouget : mshtml: Make IEventTarget_{add, remove}EventListener_hook () static.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: a7c696aee94b03a1597a9e4fea8bf5114b9b0f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c696aee94b03a1597a9e4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:57:55 2018 +0100 mshtml: Make IEventTarget_{add,remove}EventListener_hook() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cbb9954..abc0a1c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2261,7 +2261,7 @@ static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent * return dispatch_event_object(This, event, DISPATCH_STANDARD, result); } -HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { /* If only two arguments were given, implicitly set capture to false */ @@ -2282,7 +2282,7 @@ HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD f return S_FALSE; /* fallback to default */ } -HRESULT IEventTarget_removeEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT IEventTarget_removeEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { /* If only two arguments were given, implicitly set capture to false */

1 0

Alistair Leslie-Hughes : oledb32/tests: Add DataConvert DBTYPE_BSTR-> DBTYPE_DBTIMESTAMP test.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: 86147a991785c8d68531142ee60f17268eb7f3fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=86147a991785c8d68531142e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 4 03:34:00 2018 +0000 oledb32/tests: Add DataConvert DBTYPE_BSTR->DBTYPE_DBTIMESTAMP test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 6b0dd55..0825624 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3608,7 +3608,10 @@ static void test_converttovar(void) static void test_converttotimestamp(void) { static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; + static const WCHAR strFullW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2', + '.','0','1','7','0','0','0','0','0','0',0}; DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; + DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; DBTIMESTAMP dst; DBSTATUS dst_status; DBLENGTH dst_len; @@ -3635,6 +3638,15 @@ static void test_converttotimestamp(void) ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); SysFreeString(bstr); + 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"); + SysFreeString(bstr); + V_VT(&var) = VT_NULL; dst_len = 77; hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBTIMESTAMP, sizeof(var), &dst_len, &var, &dst, 2, 0, &dst_status, 0, 0, 0);

1 0

Alex Henrie : ws2_32/tests: Drop socket test workarounds for Windows <= 2000.
by Alexandre Julliard Jan. 4, 2018

Jan. 4, 2018

Module: wine Branch: master Commit: 026751313aeb13e5f62aabb85f33615800e53070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=026751313aeb13e5f62aabb8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 22:33:30 2018 -0700 ws2_32/tests: Drop socket test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 222 ++++++++++++++--------------------------------- 1 file changed, 65 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=026751313aeb13e5f62a…

1 0