January 2020 - Wine-commits

Nikolay Sivov : user32/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard 09 Jan '20

09 Jan '20

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

Nikolay Sivov : d3d8/tests: Use GetCursorInfo() directly.
by Alexandre Julliard 09 Jan '20

09 Jan '20

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 09 Jan '20

09 Jan '20

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

Zebediah Figura : netapi32/tests: Rewrite UNC/HTTP conversion tests.
by Alexandre Julliard 09 Jan '20

09 Jan '20

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

Zebediah Figura : netapi32/tests: Use wide character string constants.
by Alexandre Julliard 09 Jan '20

09 Jan '20

Module: wine Branch: master Commit: cc5e52ea521e4e3e19c4932e71d10310ee5651e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5e52ea521e4e3e19c4932e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 8 15:23:21 2020 -0600 netapi32/tests: Use wide character string constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/access.c | 79 +++++++++++++++++--------------------------- dlls/netapi32/tests/wksta.c | 27 ++++++++------- 2 files changed, 44 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc5e52ea521e4e3e19c4…

1 0

Zebediah Figura : netapi32/tests: Remove some workarounds for no longer supported versions of Windows.
by Alexandre Julliard 09 Jan '20

09 Jan '20

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

Andrey Gusev : webservices: Fix misplaced parenthesis.
by Alexandre Julliard 09 Jan '20

09 Jan '20

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 09 Jan '20

09 Jan '20

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 09 Jan '20

09 Jan '20

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 : winhttp/tests: Fix a test failure.
by Alexandre Julliard 09 Jan '20

09 Jan '20

Module: wine Branch: master Commit: 30235c0d249262269ef61deea2a99ffb1b593189 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30235c0d249262269ef61dee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 9 14:33:06 2020 +0100 winhttp/tests: Fix a test failure. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3e0e8baeb9..b73c57a41d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3564,7 +3564,7 @@ static void test_passport_auth( int port ) 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',':',' ', 'P','a','s','s','p','o','r','t','1','.','4','\r','\n','\r','\n',0}; HINTERNET ses, con, req; - DWORD status, size, option; + DWORD status, size, option, err; WCHAR buf[128]; BOOL ret; @@ -3585,8 +3585,10 @@ static void test_passport_auth( int port ) ok( ret, "got %u\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret || broken(!ret && GetLastError() == ERROR_WINHTTP_LOGIN_FAILURE) /* winxp */, "got %u\n", GetLastError() ); - if (!ret && GetLastError() == ERROR_WINHTTP_LOGIN_FAILURE) + err = GetLastError(); + ok( ret || broken(!ret && err == ERROR_WINHTTP_LOGIN_FAILURE) /* winxp */ + || broken(!ret && err == ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %u\n", err ); + if (!ret) { win_skip("no support for Passport redirects\n"); goto cleanup;

1 0