January 2020 - Wine-Commits

Zebediah Figura : netapi32/tests: Remove some workarounds for no longer supported versions of Windows.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: e480fa87adbf31a609e2056aae49348727c2df6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e480fa87adbf31a609e2056a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 8 15:23:22 2020 -0600 netapi32/tests: Remove some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/Makefile.in | 2 +- dlls/netapi32/tests/access.c | 155 +++++++++++++--------------------------- dlls/netapi32/tests/apibuf.c | 50 +++++-------- dlls/netapi32/tests/ds.c | 39 ++++------ dlls/netapi32/tests/wksta.c | 128 ++++++++++----------------------- 5 files changed, 117 insertions(+), 257 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e480fa87adbf31a609e2…

1 0

Nikolay Sivov : user32/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: cb9f5e7d0e9242e2f3fc66751ee4ed9f47e2bc0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9f5e7d0e9242e2f3fc6675… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 9 09:22:25 2020 +0300 user32/tests: Remove some workarounds for older Windows versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 88 +++++++++++++++------------------------------ dlls/user32/tests/win.c | 96 +++++++++++++++++-------------------------------- 2 files changed, 60 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb9f5e7d0e9242e2f3fc…

1 0

Alistair Leslie-Hughes : d3dx9: Make ID3DXLine::OnResetDevice() return S_OK.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: 4f0212c4fd35ac4b03a082cab27e629130ac1b13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f0212c4fd35ac4b03a082ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 8 03:41:42 2020 +0000 d3dx9: Make ID3DXLine::OnResetDevice() return S_OK. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38615 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/line.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 9ed48087a1..7b2e3b5428 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -263,7 +263,7 @@ static HRESULT WINAPI d3dx9_line_OnResetDevice(ID3DXLine *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return S_OK; } static const struct ID3DXLineVtbl d3dx9_line_vtbl =

1 0

Zebediah Figura : netapi32/tests: Rewrite UNC/HTTP conversion tests.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: f9bc81c448ab3fa5f2c047bf4bbfa4bbadeac84d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9bc81c448ab3fa5f2c047bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 8 15:23:20 2020 -0600 netapi32/tests: Rewrite UNC/HTTP conversion tests. Windows 1709 changed the algorithm to be far more restrictive. Treat those results as correct and older versions as broken. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/access.c | 378 +++++++++++++------------------------------ 1 file changed, 112 insertions(+), 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9bc81c448ab3fa5f2c0…

1 0

Nikolay Sivov : d3d8/tests: Use GetCursorInfo() directly.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: fc4aa8046db7590afa56ad7c9b686c8b2066e2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc4aa8046db7590afa56ad7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 9 09:22:48 2020 +0300 d3d8/tests: Use GetCursorInfo() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f598ad4f45..80bf62e361 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -55,8 +55,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); static HRESULT (WINAPI *ValidatePixelShader)(const DWORD *, const D3DCAPS8 *, BOOL, char **); -static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); - static const DWORD simple_vs[] = {0xFFFE0101, /* vs_1_1 */ 0x00000009, 0xC0010000, 0x90E40000, 0xA0E40000, /* dp4 oPos.x, v0, c0 */ 0x00000009, 0xC0020000, 0x90E40000, 0xA0E40001, /* dp4 oPos.y, v0, c1 */ @@ -930,7 +928,6 @@ cleanup: static void test_cursor(void) { - HMODULE user32_handle = GetModuleHandleA("user32.dll"); IDirect3DSurface8 *cursor = NULL; IDirect3DDevice8 *device; CURSORINFO info; @@ -941,13 +938,6 @@ static void test_cursor(void) HRESULT hr; BOOL ret; - pGetCursorInfo = (void *)GetProcAddress(user32_handle, "GetCursorInfo"); - if (!pGetCursorInfo) - { - win_skip("GetCursorInfo is not available\n"); - return; - } - window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -957,7 +947,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor; d3d = Direct3DCreate8(D3D_SDK_VERSION); @@ -990,7 +980,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ @@ -1004,7 +994,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor);

1 0

Nikolay Sivov : advapi32/tests: Remove some workarounds for older versions.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: 10646ddb914343cbbf6c03401c07bc0b43a9099e URL: https://source.winehq.org/git/wine.git/?a=commit;h=10646ddb914343cbbf6c0340… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 9 09:24:27 2020 +0300 advapi32/tests: Remove some workarounds for older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 360 ++++++++++++++++------------------------- dlls/advapi32/tests/service.c | 13 +- 2 files changed, 147 insertions(+), 226 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10646ddb914343cbbf6c…

1 0

Andrey Gusev : webservices: Fix misplaced parenthesis.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: 37f144d11712db8be69488ac345d05ee52dc0c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37f144d11712db8be69488ac… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 8 17:34:13 2020 +0200 webservices: Fix misplaced parenthesis. 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/webservices/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 71207bee6b..10c33dc07d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2355,7 +2355,7 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ return E_INVALIDARG; } - if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK && (hr = connect_channel( channel ) == S_OK)) + if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK && (hr = connect_channel( channel )) == S_OK) hr = send_message( channel, msg ); LeaveCriticalSection( &channel->cs );

1 0

Andrey Gusev : mshtml/tests: Fix a typo.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: 4757bcc541b9f67180f0af1238b5369efe5eb3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=4757bcc541b9f67180f0af12… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jan 9 14:17:32 2020 +0200 mshtml/tests: Fix a typo. In addition to 27146e994776c0d13078ea0b15e04c279a867552. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index e62b83df3b..87ac62a6a7 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2550,7 +2550,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc IActiveScriptSiteInterruptPoll *poll; IActiveScriptSiteDebug *debug; IServiceProvider *service; - ICanHandleException *canexpection; + ICanHandleException *canexception; LCID lcid; HRESULT hres; @@ -2574,7 +2574,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc if(SUCCEEDED(hres)) IActiveScriptSiteDebug_Release(debug); - hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); + hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexception); ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service);

1 0

Andrey Gusev : scrobj/tests: Fix a typo.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: c54ea2ac9e74d9d8a633aa0a27c2089c9c573042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c54ea2ac9e74d9d8a633aa0a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jan 9 14:17:50 2020 +0200 scrobj/tests: Fix a typo. In addition to 27146e994776c0d13078ea0b15e04c279a867552. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/tests/scrobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 93779883fe..4154af43de 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -392,7 +392,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc IActiveScriptSiteWindow *window; IActiveScriptSiteDebug *debug; IServiceProvider *service; - ICanHandleException *canexpection; + ICanHandleException *canexception; LCID lcid; HRESULT hres; @@ -415,7 +415,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc if (SUCCEEDED(hres)) IActiveScriptSiteDebug_Release(debug); - hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); + hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexception); ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service);

1 0

Hans Leidekker : wininet/tests: Fix test failures on Windows XP.
by Alexandre Julliard Jan. 9, 2020

Jan. 9, 2020

Module: wine Branch: master Commit: 4c640f24c9901ccaf8706de31e22149130c57be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c640f24c9901ccaf8706de3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 9 14:34:57 2020 +0100 wininet/tests: Fix test failures on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8f3d02e664..e0ea78cfb4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -42,6 +42,7 @@ #define TEST_URL "http://test.winehq.org/tests/hello.html" static BOOL first_connection_to_test_url = TRUE; +static BOOL https_support = TRUE; /* Adapted from dlls/urlmon/tests/protocol.c */ @@ -6220,6 +6221,12 @@ static void test_security_flags(void) char buf[100]; BOOL res; + if (!https_support) + { + win_skip("Can't make https connections, skipping security flags test\n"); + return; + } + trace("Testing security flags...\n"); reset_events(); @@ -6556,7 +6563,7 @@ static void test_secure_connection(void) static const WCHAR get[] = {'G','E','T',0}; static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; - DWORD size, flags; + DWORD size, flags, err; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; BOOL ret; @@ -6574,11 +6581,13 @@ static void test_secure_connection(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), - "HttpSendRequest failed: %d\n", GetLastError()); + err = GetLastError(); + ok(ret || broken(err == ERROR_INTERNET_CANNOT_CONNECT) || + broken(err == ERROR_INTERNET_SECURITY_CHANNEL_ERROR), "HttpSendRequest failed: %u\n", err); if (!ret) { win_skip("Cannot connect to https.\n"); + if (err == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) https_support = FALSE; goto done; } @@ -7375,6 +7384,11 @@ static void test_default_service_port(void) ok(request != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + if (!ret && GetLastError() == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) + { + win_skip("Can't make https connection\n"); + goto done; + } ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = sizeof(buffer); @@ -7402,6 +7416,7 @@ static void test_default_service_port(void) ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); +done: InternetCloseHandle(request); InternetCloseHandle(connect); InternetCloseHandle(session); @@ -7529,6 +7544,7 @@ START_TEST(http) InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); InternetReadFile_test(0, &test_data[1]); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); + test_secure_connection(); test_security_flags(); InternetReadFile_test(0, &test_data[2]); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); @@ -7543,7 +7559,6 @@ START_TEST(http) InternetOpenUrlA_test(); HttpHeaders_test(); test_http_connection(); - test_secure_connection(); test_user_agent_header(); test_bogus_accept_types_array(); InternetReadFile_chunked_test();

1 0