January 2018 - Wine-commits

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

05 Jan '18

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

Andrey Gusev : user32/tests: Fix resource leak.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: f547891e7652cca4c540b7771aa67f95c9a200ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f547891e7652cca4c540b777… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 5 14:37:28 2018 +0200 user32/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f9472ec..f492ecc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9400,6 +9400,7 @@ static void test_smresult(void) CloseHandle(data.thread_got_wm_app); CloseHandle(data.main_in_wm_app_1); CloseHandle(data.thread_replied); + CloseHandle(hThread); } static void test_GetMessagePos(void)

1 0

Andrey Gusev : shell32/tests: Fix resource leak.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 498009c6bd530dc5544b21e7cd6941fd7211a7b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=498009c6bd530dc5544b21e7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 5 15:23:26 2018 +0200 shell32/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 28dad2c..0bb4960 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -452,6 +452,7 @@ static void test_request_groups(DWORD instance, HCONV hconv) "directory '%s' missing from group list\n", finddata.cFileName); } } while (FindNextFileA(hfind, &finddata)); + FindClose(hfind); } START_TEST(progman_dde)

1 0

Nikolay Sivov : oleaut32/tests: Test more return values.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 0fc0e34fb0260bc54d060c79571dcf0acb7bb4a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc0e34fb0260bc54d060c79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 5 14:25:11 2018 +0300 oleaut32/tests: Test more return values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 4a81e2e..7db1d84 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -722,7 +722,8 @@ static void test_Render(void) HDC hdc = create_render_dc(); /* test IPicture::Render return code on uninitialized picture */ - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, &type); ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); @@ -755,7 +756,8 @@ static void test_Render(void) return; } - OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); /* zero dimensions, PICTYPE_ICON */ hres = picture_render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); @@ -809,7 +811,8 @@ static void test_get_Attributes(void) short type; DWORD attr; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, &type); ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); @@ -830,8 +833,8 @@ static void test_get_Handle(void) IPicture *pic; HRESULT hres; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); - + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Handle(pic, NULL); ole_expect(hres, E_POINTER); @@ -843,7 +846,8 @@ static void test_get_Type(void) IPicture *pic; HRESULT hres; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, NULL); ole_expect(hres, E_POINTER);

1 0

Alex Henrie : mshtml/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 93eac48cc70e553a7ba0895999565e87d4de3b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93eac48cc70e553a7ba08959… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 4 22:02:30 2018 -0700 mshtml/tests: Add a trailing '\n' to ok() calls. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.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 +- dlls/mshtml/tests/xmlhttprequest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 28aa93c..908e647 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -384,7 +384,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD if(pdp->cArgs > 1) ok_(__FILE__,line) (V_VT(pdp->rgvarg+1) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg+1)); ok_(__FILE__,line) (pvarRes != NULL, "pvarRes == NULL\n"); - ok_(__FILE__,line) (pei != NULL, "pei == NULL"); + ok_(__FILE__,line) (pei != NULL, "pei == NULL\n"); ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index df5d644..733987f 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -132,7 +132,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, const IID *broke pdp->rgdispidNamedArgs[0]); ok_(__FILE__,line) (V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok_(__FILE__,line) (pvarRes != NULL, "pvarRes == NULL\n"); - ok_(__FILE__,line) (pei != NULL, "pei == NULL"); + ok_(__FILE__,line) (pei != NULL, "pei == NULL\n"); ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid)

1 0

Nikolay Sivov : mshtml/tests: Test document stream creation failure ( Coverity).
by Alexandre Julliard 05 Jan '18

05 Jan '18

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

Nikolay Sivov : mshtml/tests: Remove null check after dereference ( Coverity).
by Alexandre Julliard 05 Jan '18

05 Jan '18

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

Andrey Gusev : winhttp/tests: Fix resource leak.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 67e80856e65f2d52fca5ad3cd23ad0a92b8c0b5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=67e80856e65f2d52fca5ad3c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 5 14:38:11 2018 +0200 winhttp/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 3 +++ dlls/winhttp/tests/winhttp.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index da8f8e9..2a647e3 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1033,7 +1033,10 @@ START_TEST (notification) ret = WaitForSingleObject( si.event, 10000 ); ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); return; + } test_persistent_connection( si.port ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e06661c..4399cf6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4475,7 +4475,10 @@ START_TEST (winhttp) ret = WaitForSingleObject(si.event, 10000); ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); return; + } test_IWinHttpRequest(si.port); test_connection_info(si.port); @@ -4495,4 +4498,5 @@ START_TEST (winhttp) test_basic_request(si.port, NULL, quitW); WaitForSingleObject(thread, 3000); + CloseHandle(thread); }

1 0

Alistair Leslie-Hughes : oledb32/tests: Add DataConvert DBTYPE_BSTR-> DBTYPE_DBTIMESTAMP test.
by Alexandre Julliard 04 Jan '18

04 Jan '18

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 04 Jan '18

04 Jan '18

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