January 2018 - Wine-Commits

Francois Gouget : msvcr90/tests: Make test__vsnwprintf() static.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: c1ff2f19b5ac96b8f1a8f21457b97da6ff323079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1ff2f19b5ac96b8f1a8f214… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 15:56:07 2018 +0100 msvcr90/tests: Make test__vsnwprintf() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 85dd80b..dd62f3a 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1876,7 +1876,7 @@ static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t * return ret; } -void test__vsnwprintf(void) +static void test__vsnwprintf(void) { int ret; WCHAR str[2] = {0};

1 0

Henri Verbeet : wined3d: Add a download function for WINED3DFMT_X8D24_UNORM.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: bc75bec270bfdc09c881799b331aabf4d119a271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc75bec270bfdc09c881799b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 5 18:53:12 2018 +0100 wined3d: Add a download function for WINED3DFMT_X8D24_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 58 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/texture.c | 10 ++++---- dlls/wined3d/utils.c | 47 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 8 ++++-- 4 files changed, 99 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc75bec270bfdc09c881…

1 0

Henri Verbeet : ddraw/tests: Add a depth read-back test.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: f427714bf958a83a8bfb5129044498611dfaff59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f427714bf958a83a8bfb5129… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 5 18:53:13 2018 +0100 ddraw/tests: Add a depth read-back test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 134 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 132 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 141 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 555 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f427714bf958a83a8bfb…

1 0

Alex Henrie : msvcrt: Don' t include MSVC 7.1+ purecall functions in SOs for older DLLs.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 5041d89b9779dd3b4f3ef9b9f9e054db714f7e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5041d89b9779dd3b4f3ef9b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 21:33:03 2018 -0700 msvcrt: Don't include MSVC 7.1+ purecall functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 44b29c1..d0e93d7 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -462,6 +462,7 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac tls_atexit_callback = callback; } +#if _MSVCR_VER>=71 /********************************************************************* * _set_purecall_handler (MSVCR71.@) */ @@ -473,15 +474,18 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func purecall_handler = function; return ret; } +#endif +#if _MSVCR_VER>=80 /********************************************************************* - * _get_purecall_handler + * _get_purecall_handler (MSVCR80.@) */ MSVCRT_purecall_handler CDECL _get_purecall_handler(void) { TRACE("\n"); return purecall_handler; } +#endif /********************************************************************* * _purecall (MSVCRT.@)

1 0

Nikolay Sivov : ddraw/tests: Add another invalid arguments test for surface QI.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 030803b422197c7953894e91458c8247ac3633bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=030803b422197c7953894e91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 5 18:50:40 2018 +0300 ddraw/tests: Add another invalid arguments test for surface QI. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 1 + dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 1 + dlls/ddraw/tests/dsurface.c | 28 ---------------------------- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9a872f8..d416cf5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1963,6 +1963,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface *surface; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index dc74c69..2186c31 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2083,6 +2083,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface *surface; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index aeac118..4c1bd78 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2233,6 +2233,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_INVALIDARG }, {&IID_IDirectDrawClipper, NULL, E_INVALIDARG }, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface4 *surface; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ce4117b..d7355cf 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1970,6 +1970,7 @@ static void test_surface_qi(void) {&IID_IDirectDrawPalette, NULL, E_NOINTERFACE}, {&IID_IDirectDrawClipper, NULL, E_NOINTERFACE}, {&IID_IUnknown, &IID_IDirectDrawSurface, S_OK }, + {NULL, NULL, E_INVALIDARG }, }; IDirectDrawSurface7 *surface; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 9e02295..90e7fcf 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -61,33 +61,6 @@ static void ReleaseDirectDraw(void) } } -static void QueryInterface(void) -{ - IDirectDrawSurface *dsurface; - DDSURFACEDESC surface; - void *object; - HRESULT ret; - - /* Create a surface */ - ZeroMemory(&surface, sizeof(surface)); - surface.dwSize = sizeof(surface); - surface.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; - surface.dwHeight = 10; - surface.dwWidth = 10; - ret = IDirectDraw_CreateSurface(lpDD, &surface, &dsurface, NULL); - if(ret != DD_OK) - { - ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); - return; - } - - /* Call IUnknown::QueryInterface */ - ret = IDirectDrawSurface_QueryInterface(dsurface, 0, &object); - ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface::QueryInterface returned %x\n", ret); - - IDirectDrawSurface_Release(dsurface); -} - /* The following tests test which interface is returned by IDirectDrawSurfaceX::GetDDInterface. * It uses refcounts to test that and compares the interface addresses. Partially fits here, and * partially in the refcount test @@ -2632,7 +2605,6 @@ START_TEST(dsurface) return; } - QueryInterface(); GetDDInterface_1(); GetDDInterface_2(); GetDDInterface_4();

1 0

Andrey Gusev : winhttp/tests: Fix resource leak.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

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

Andrey Gusev : user32/tests: Fix resource leak.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

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 Jan. 5, 2018

Jan. 5, 2018

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 Jan. 5, 2018

Jan. 5, 2018

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 Jan. 5, 2018

Jan. 5, 2018

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