September 2019 - Wine-commits

Alex Henrie : gdi32: Handle HeapAlloc failure in SetEnhMetaFileBits (scan-build).
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 1fcae3c260a9a8809c733aa9c6b2b4c1c336f20c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fcae3c260a9a8809c733aa9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 11 21:05:49 2019 -0600 gdi32: Handle HeapAlloc failure in SetEnhMetaFileBits (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index a3360c269a..fc3389ff23 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -480,7 +480,9 @@ HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT bufsize, const BYTE *buf) { ENHMETAHEADER *emh = HeapAlloc( GetProcessHeap(), 0, bufsize ); HENHMETAFILE hmf; - memmove(emh, buf, bufsize); + + if (!emh) return 0; + memcpy(emh, buf, bufsize); hmf = EMF_Create_HENHMETAFILE( emh, bufsize, FALSE ); if (!hmf) HeapFree( GetProcessHeap(), 0, emh );

1 0

Alex Henrie : winex11: Factor out array access in ConvertAttribWGLtoGLX (scan-build).
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: a28980da5a83fe15be48bd4eb1bda98eb3520eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a28980da5a83fe15be48bd4e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 11 21:06:10 2019 -0600 winex11: Factor out array access in ConvertAttribWGLtoGLX (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ee28a1d790..7fb97f5f44 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -751,7 +751,7 @@ static const char *debugstr_fbconfig( GLXFBConfig fbconfig ) static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_pbuffer* pbuf) { int nAttribs = 0; unsigned cur = 0; - int pop; + int attr, pop; int drawattrib = 0; int nvfloatattrib = GLX_DONT_CARE; int pixelattrib = GLX_DONT_CARE; @@ -759,62 +759,53 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ /* The list of WGL attributes is allowed to be NULL. We don't return here for NULL * because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */ while (iWGLAttr && 0 != iWGLAttr[cur]) { - TRACE("pAttr[%d] = %x\n", cur, iWGLAttr[cur]); + attr = iWGLAttr[cur]; + TRACE("pAttr[%d] = %x\n", cur, attr); + pop = iWGLAttr[++cur]; - switch (iWGLAttr[cur]) { + switch (attr) { case WGL_AUX_BUFFERS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_AUX_BUFFERS, pop); TRACE("pAttr[%d] = GLX_AUX_BUFFERS: %d\n", cur, pop); break; case WGL_COLOR_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_BUFFER_SIZE, pop); TRACE("pAttr[%d] = GLX_BUFFER_SIZE: %d\n", cur, pop); break; case WGL_BLUE_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_BLUE_SIZE, pop); TRACE("pAttr[%d] = GLX_BLUE_SIZE: %d\n", cur, pop); break; case WGL_RED_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_RED_SIZE, pop); TRACE("pAttr[%d] = GLX_RED_SIZE: %d\n", cur, pop); break; case WGL_GREEN_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_GREEN_SIZE, pop); TRACE("pAttr[%d] = GLX_GREEN_SIZE: %d\n", cur, pop); break; case WGL_ALPHA_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_ALPHA_SIZE, pop); TRACE("pAttr[%d] = GLX_ALPHA_SIZE: %d\n", cur, pop); break; case WGL_DEPTH_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_DEPTH_SIZE, pop); TRACE("pAttr[%d] = GLX_DEPTH_SIZE: %d\n", cur, pop); break; case WGL_STENCIL_BITS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_STENCIL_SIZE, pop); TRACE("pAttr[%d] = GLX_STENCIL_SIZE: %d\n", cur, pop); break; case WGL_DOUBLE_BUFFER_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, pop); TRACE("pAttr[%d] = GLX_DOUBLEBUFFER: %d\n", cur, pop); break; case WGL_STEREO_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_STEREO, pop); TRACE("pAttr[%d] = GLX_STEREO: %d\n", cur, pop); break; case WGL_PIXEL_TYPE_ARB: - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_PIXEL_TYPE_ARB: %d\n", cur, pop); switch (pop) { case WGL_TYPE_COLORINDEX_ARB: pixelattrib = GLX_COLOR_INDEX_BIT; break ; @@ -824,24 +815,20 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: pixelattrib = GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT; break ; default: ERR("unexpected PixelType(%x)\n", pop); - pop = 0; } break; case WGL_SUPPORT_GDI_ARB: /* This flag is set in a pixel format */ - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_SUPPORT_GDI_ARB: %d\n", cur, pop); break; case WGL_DRAW_TO_BITMAP_ARB: /* This flag is set in a pixel format */ - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_DRAW_TO_BITMAP_ARB: %d\n", cur, pop); break; case WGL_DRAW_TO_WINDOW_ARB: - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_DRAW_TO_WINDOW_ARB: %d\n", cur, pop); /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ if (pop) { @@ -850,7 +837,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ break; case WGL_DRAW_TO_PBUFFER_ARB: - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_DRAW_TO_PBUFFER_ARB: %d\n", cur, pop); /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ if (pop) { @@ -860,18 +846,15 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_ACCELERATION_ARB: /* This flag is set in a pixel format */ - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_ACCELERATION_ARB: %d\n", cur, pop); break; case WGL_SUPPORT_OPENGL_ARB: - pop = iWGLAttr[++cur]; /** nothing to do, if we are here, supposing support Accelerated OpenGL */ TRACE("pAttr[%d] = WGL_SUPPORT_OPENGL_ARB: %d\n", cur, pop); break; case WGL_SWAP_METHOD_ARB: - pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_SWAP_METHOD_ARB: %#x\n", cur, pop); if (has_swap_method) { @@ -899,19 +882,16 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ break; case WGL_PBUFFER_LARGEST_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_LARGEST_PBUFFER, pop); TRACE("pAttr[%d] = GLX_LARGEST_PBUFFER: %x\n", cur, pop); break; case WGL_SAMPLE_BUFFERS_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_SAMPLE_BUFFERS_ARB, pop); TRACE("pAttr[%d] = GLX_SAMPLE_BUFFERS_ARB: %x\n", cur, pop); break; case WGL_SAMPLES_ARB: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_SAMPLES_ARB, pop); TRACE("pAttr[%d] = GLX_SAMPLES_ARB: %x\n", cur, pop); break; @@ -919,8 +899,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_TEXTURE_FORMAT_ARB: case WGL_TEXTURE_TARGET_ARB: case WGL_MIPMAP_TEXTURE_ARB: - TRACE("WGL_render_texture Attributes: %x as %x\n", iWGLAttr[cur], iWGLAttr[cur + 1]); - pop = iWGLAttr[++cur]; + TRACE("WGL_render_texture Attributes: %x as %x\n", iWGLAttr[cur - 1], iWGLAttr[cur]); if (NULL == pbuf) { ERR("trying to use GLX_Pbuffer Attributes without Pbuffer (was %x)\n", iWGLAttr[cur]); } @@ -934,7 +913,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ } break ; case WGL_FLOAT_COMPONENTS_NV: - nvfloatattrib = iWGLAttr[++cur]; + nvfloatattrib = pop; TRACE("pAttr[%d] = WGL_FLOAT_COMPONENTS_NV: %x\n", cur, nvfloatattrib); break ; case WGL_BIND_TO_TEXTURE_DEPTH_NV: @@ -944,26 +923,22 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV: case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV: case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV: - pop = iWGLAttr[++cur]; /** cannot be converted, see direct handling on * - wglGetPixelFormatAttribivARB * TODO: wglChoosePixelFormat */ break ; case WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, pop); TRACE("pAttr[%d] = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT: %x\n", cur, pop); break ; case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: - pop = iWGLAttr[++cur]; PUSH2(oGLXAttr, GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT, pop); TRACE("pAttr[%d] = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT: %x\n", cur, pop); break ; default: - FIXME("unsupported %x WGL Attribute\n", iWGLAttr[cur]); - cur++; + FIXME("unsupported %x WGL Attribute\n", attr); break; } ++cur;

1 0

Alistair Leslie-Hughes : wininet/tests: InternetQueryOption should return a valid value for username/password when using cached credentials.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: be2c77e6364324326a9bb583bb9dc9c2d66c64e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be2c77e6364324326a9bb583… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 12 03:29:54 2019 +0000 wininet/tests: InternetQueryOption should return a valid value for username/password when using cached credentials. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a4521a94a4..80d2aad9f4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4425,6 +4425,7 @@ static void test_basic_auth_credentials_reuse(int port) HINTERNET ses, con, req; DWORD status, size; BOOL ret; + char buffer[0x40]; ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -4439,6 +4440,20 @@ static void test_basic_auth_credentials_reuse(int port) ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); + status = 0xdeadbeef; size = sizeof(status); ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); @@ -4462,6 +4477,20 @@ static void test_basic_auth_credentials_reuse(int port) ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "user"), "got %s\n", buffer); + todo_wine ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + todo_wine ok(size == 3, "got %u\n", size); + status = 0xdeadbeef; size = sizeof(status); ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL );

1 0

Rémi Bernon : user32/tests: Add RegisterRawInputDevices parameter validation tests.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: d8b222548d6f6b626a644a585787bdef18467200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8b222548d6f6b626a644a58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 10 19:02:30 2019 +0200 user32/tests: Add RegisterRawInputDevices parameter validation tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/rawinput.c | 104 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 7149dc824e..26bc3b2bc6 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ menu.c \ monitor.c \ msg.c \ + rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/tests/rawinput.c b/dlls/user32/tests/rawinput.c new file mode 100644 index 0000000000..4aa2a162f4 --- /dev/null +++ b/dlls/user32/tests/rawinput.c @@ -0,0 +1,104 @@ +/* Unit test suite for rawinput. + * + * Copyright 2019 Remi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +static void test_RegisterRawInputDevices(void) +{ + HWND hwnd; + RAWINPUTDEVICE raw_devices[1]; + BOOL res; + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x05; + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + + res = RegisterRawInputDevices(NULL, 0, 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + + + raw_devices[0].dwFlags = 0; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_REMOVE requires hwndTarget == NULL */ + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + todo_wine + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_INPUTSINK requires hwndTarget != NULL */ + raw_devices[0].dwFlags = RIDEV_INPUTSINK; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + todo_wine + ok(res == FALSE, "RegisterRawInputDevices failed\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + DestroyWindow(hwnd); +} + +START_TEST(rawinput) +{ + test_RegisterRawInputDevices(); +}

1 0

Rémi Bernon : user32: Add parameter validation for RegisterRawInputDevices.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 85d8d1390467147fca416236fd50bb6ea2e2c8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d8d1390467147fca416236… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 10 19:02:31 2019 +0200 user32: Add parameter validation for RegisterRawInputDevices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 11 +++++++++++ dlls/user32/tests/rawinput.c | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 49cf9f73a0..94cf7a9a5d 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -261,9 +261,20 @@ BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, U if (size != sizeof(*devices)) { WARN("Invalid structure size %u.\n", size); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + for (i = 0; i < device_count; ++i) + { + if ((devices[i].dwFlags & RIDEV_REMOVE) && + (devices[i].hwndTarget != NULL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + if (!(d = HeapAlloc( GetProcessHeap(), 0, device_count * sizeof(*d) ))) return FALSE; for (i = 0; i < device_count; ++i) diff --git a/dlls/user32/tests/rawinput.c b/dlls/user32/tests/rawinput.c index 4aa2a162f4..f4c8eb6738 100644 --- a/dlls/user32/tests/rawinput.c +++ b/dlls/user32/tests/rawinput.c @@ -49,7 +49,6 @@ static void test_RegisterRawInputDevices(void) SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -64,9 +63,7 @@ static void test_RegisterRawInputDevices(void) SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - todo_wine ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = 0;

1 0

Alexandre Julliard : configure: Check for unw_step() instead of unw_getcontext().
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 4c0f59ddbc863976a21bfceacf5b65157efbb421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c0f59ddbc863976a21bfcea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 11:38:30 2019 +0200 configure: Check for unw_step() instead of unw_getcontext(). unw_getcontext() can be inlined. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 40 ++++++++++++++++++++-------------------- configure.ac | 22 +++++++++++----------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 83d8591c1d..109d2423a2 100755 --- a/configure +++ b/configure @@ -14893,9 +14893,9 @@ $as_echo "$as_me:${as_lineno-$LINENO}: libunwind cflags: $UNWIND_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: libunwind libs: $UNWIND_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $UNWIND_CFLAGS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_getcontext" >&5 -$as_echo_n "checking for unw_getcontext... " >&6; } -if ${wine_cv_have_unw_getcontext+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step" >&5 +$as_echo_n "checking for unw_step... " >&6; } +if ${wine_cv_have_unw_step+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14905,28 +14905,28 @@ else int main () { -unw_context_t context; unw_getcontext( &context ); +unw_context_t context; unw_step( &context ); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - wine_cv_have_unw_getcontext="yes" + wine_cv_have_unw_step="yes" else - wine_cv_have_unw_getcontext="no" + wine_cv_have_unw_step="no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_unw_getcontext" >&5 -$as_echo "$wine_cv_have_unw_getcontext" >&6; } - if test "$wine_cv_have_unw_getcontext" = no -a -n "$UNWIND_LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_unw_step" >&5 +$as_echo "$wine_cv_have_unw_step" >&6; } + if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then save_libs=$LIBS LIBS="$UNWIND_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_getcontext in libunwind" >&5 -$as_echo_n "checking for unw_getcontext in libunwind... " >&6; } -if ${wine_cv_have_libunwind_unw_getcontext+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step in libunwind" >&5 +$as_echo_n "checking for unw_step in libunwind... " >&6; } +if ${wine_cv_have_libunwind_unw_step+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14936,25 +14936,25 @@ else int main () { -unw_context_t context; unw_getcontext( &context ); +unw_context_t context; unw_step( &context ); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - wine_cv_have_libunwind_unw_getcontext="yes" + wine_cv_have_libunwind_unw_step="yes" else - wine_cv_have_libunwind_unw_getcontext="no" + wine_cv_have_libunwind_unw_step="no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_libunwind_unw_getcontext" >&5 -$as_echo "$wine_cv_have_libunwind_unw_getcontext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_libunwind_unw_step" >&5 +$as_echo "$wine_cv_have_libunwind_unw_step" >&6; } LIBS=$save_libs fi - test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS="" - if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono + test "$wine_cv_have_libunwind_unw_step" = yes || UNWIND_LIBS="" + if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono then $as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h @@ -14967,7 +14967,7 @@ test -z "$UNWIND_LIBS" || UNWIND_LIBS=`echo " $UNWIND_LIBS" | sed 's/ -L$[^/]$ fi case $host in aarch64*|*-darwin*) - if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono; then : + if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono; then : case "x$with_unwind" in x) as_fn_append wine_notices "|libunwind ${notice_platform}development files not found, stack unwinding won't work." ;; xno) ;; diff --git a/configure.ac b/configure.ac index b39b6b2c90..dfa6b6ac9c 100644 --- a/configure.ac +++ b/configure.ac @@ -1694,32 +1694,32 @@ dnl **** Check for libuwind **** if test "x$with_unwind" != xno then WINE_PACKAGE_FLAGS(UNWIND,[libunwind],[-lunwind],,, - [AC_CACHE_CHECK([for unw_getcontext],wine_cv_have_unw_getcontext, + [AC_CACHE_CHECK([for unw_step],wine_cv_have_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_getcontext( &context );]])], - [wine_cv_have_unw_getcontext="yes"],[wine_cv_have_unw_getcontext="no"])]) - if test "$wine_cv_have_unw_getcontext" = no -a -n "$UNWIND_LIBS" + [[unw_context_t context; unw_step( &context );]])], + [wine_cv_have_unw_step="yes"],[wine_cv_have_unw_step="no"])]) + if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then save_libs=$LIBS LIBS="$UNWIND_LIBS $LIBS" - AC_CACHE_CHECK([for unw_getcontext in libunwind],wine_cv_have_libunwind_unw_getcontext, + AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_getcontext( &context );]])], - [wine_cv_have_libunwind_unw_getcontext="yes"], - [wine_cv_have_libunwind_unw_getcontext="no"])]) + [[unw_context_t context; unw_step( &context );]])], + [wine_cv_have_libunwind_unw_step="yes"], + [wine_cv_have_libunwind_unw_step="no"])]) LIBS=$save_libs fi - test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS="" - if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono + test "$wine_cv_have_libunwind_unw_step" = yes || UNWIND_LIBS="" + if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono then AC_DEFINE(HAVE_LIBUNWIND,1,[Define to 1 if you have the `unwind' library (-lunwind).]) fi]) fi case $host in aarch64*|*-darwin*) - WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono], + WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono], [libunwind ${notice_platform}development files not found, stack unwinding won't work.]) ;; esac

1 0

Alexandre Julliard : ntdll: Use virtual_uninterrupted_read_memory() to read code inside signal handler on x86-64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 24876bf17e7c6c7c9c39a6a05aa609cba33c93a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24876bf17e7c6c7c9c39a6a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 11:31:13 2019 +0200 ntdll: Use virtual_uninterrupted_read_memory() to read code inside signal handler on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index feb2e69d3f..d48f445f67 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2829,10 +2829,11 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec */ static inline DWORD is_privileged_instr( CONTEXT *context ) { - const BYTE *instr = (BYTE *)context->Rip; - unsigned int prefix_count = 0; + BYTE instr[16]; + unsigned int i, prefix_count = 0; + unsigned int len = virtual_uninterrupted_read_memory( (BYTE *)context->Rip, instr, sizeof(instr) ); - for (;;) switch(*instr) + for (i = 0; i < len; i++) switch (instr[i]) { /* instruction prefixes */ case 0x2e: /* %cs: */ @@ -2863,11 +2864,11 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) case 0xf2: /* repne */ case 0xf3: /* repe */ if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION; - instr++; continue; case 0x0f: /* extended instruction */ - switch(instr[1]) + if (i == len - 1) return 0; + switch (instr[i + 1]) { case 0x06: /* clts */ case 0x08: /* invd */ @@ -2899,6 +2900,7 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) default: return 0; } + return 0; }

1 0

Alexandre Julliard : ntdll: Use a stack_layout structure to build exception data on x86-64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 6e6711d77371dc96c7127cf6518be8ef796a8e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e6711d77371dc96c7127cf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 16:44:21 2019 +0200 ntdll: Use a stack_layout structure to build exception data on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 174 ++++++++++++++++++++------------------------- 1 file changed, 79 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e6711d77371dc96c712…

1 0

Alexandre Julliard : ntdll: Use a stack_layout structure to build exception data on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 04c73a89309fb20b0bb6fa06de048e113779b28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=04c73a89309fb20b0bb6fa06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 19:20:14 2019 +0200 ntdll: Use a stack_layout structure to build exception data on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 138 ++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04c73a89309fb20b0bb6…

1 0

Alexandre Julliard : ntdll: Factor out setup_raise_exception() on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 41509c0d5be4172d673249e1faccaf1117d43434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41509c0d5be4172d673249e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 19:23:26 2019 +0200 ntdll: Factor out setup_raise_exception() on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 69 ++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index d58e1e5653..5699a99932 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1786,7 +1786,7 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) * Setup the exception record and context on the thread stack. */ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void *stack_ptr, - WORD fs, WORD gs, raise_func func ) + WORD fs, WORD gs ) { struct stack_layout *stack = stack_ptr; DWORD exception_code = 0; @@ -1848,10 +1848,6 @@ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void #elif defined(VALGRIND_MAKE_WRITABLE) VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); #endif - stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ - stack->rec_ptr = &stack->rec; - stack->context_ptr = &stack->context; - stack->rec.ExceptionRecord = NULL; stack->rec.ExceptionCode = exception_code; stack->rec.ExceptionFlags = EXCEPTION_CONTINUABLE; @@ -1859,19 +1855,6 @@ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void stack->rec.NumberParameters = 0; save_context( &stack->context, sigcontext, fs, gs ); - - /* now modify the sigcontext to return to the raise function */ - ESP_sig(sigcontext) = (DWORD)stack; - EIP_sig(sigcontext) = (DWORD)func; - /* clear single-step, direction, and align check flag */ - EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); - CS_sig(sigcontext) = wine_get_cs(); - DS_sig(sigcontext) = wine_get_ds(); - ES_sig(sigcontext) = wine_get_es(); - FS_sig(sigcontext) = wine_get_fs(); - GS_sig(sigcontext) = wine_get_gs(); - SS_sig(sigcontext) = wine_get_ss(); - return stack; } @@ -1883,12 +1866,35 @@ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void * sigcontext so that the return from the signal handler will call * the raise function. */ -static struct stack_layout *setup_exception( ucontext_t *sigcontext, raise_func func ) +static struct stack_layout *setup_exception( ucontext_t *sigcontext ) { WORD fs, gs; void *stack = init_handler( sigcontext, &fs, &gs ); - return setup_exception_record( sigcontext, stack, fs, gs, func ); + return setup_exception_record( sigcontext, stack, fs, gs ); +} + + +/*********************************************************************** + * setup_raise_exception + * + * Change context to setup a call to a raise exception function. + */ +static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack, raise_func func ) +{ + ESP_sig(sigcontext) = (DWORD)stack; + EIP_sig(sigcontext) = (DWORD)func; + /* clear single-step, direction, and align check flag */ + EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); + CS_sig(sigcontext) = wine_get_cs(); + DS_sig(sigcontext) = wine_get_ds(); + ES_sig(sigcontext) = wine_get_es(); + FS_sig(sigcontext) = wine_get_fs(); + GS_sig(sigcontext) = wine_get_gs(); + SS_sig(sigcontext) = wine_get_ss(); + stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ + stack->rec_ptr = &stack->rec; /* arguments for raise_func */ + stack->context_ptr = &stack->context; } @@ -2055,14 +2061,14 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case 1: /* handled */ return; case -1: /* overflow */ - stack = setup_exception_record( context, stack_ptr, fs, gs, raise_segv_exception ); + stack = setup_exception_record( context, stack_ptr, fs, gs ); stack->rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; - return; + goto done; } } - stack = setup_exception_record( context, stack_ptr, fs, gs, raise_segv_exception ); - if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; + stack = setup_exception_record( context, stack_ptr, fs, gs ); + if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) goto done; switch(get_trap_code(context)) { @@ -2116,6 +2122,8 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } +done: + setup_raise_exception( context, stack, raise_segv_exception ); } @@ -2127,7 +2135,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { ucontext_t *context = sigcontext; - struct stack_layout *stack = setup_exception( context, raise_trap_exception ); + struct stack_layout *stack = setup_exception( context ); switch(get_trap_code(context)) { @@ -2145,6 +2153,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionInformation[2] = 0; /* FIXME */ break; } + setup_raise_exception( context, stack, raise_trap_exception ); } @@ -2156,7 +2165,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { ucontext_t *context = sigcontext; - struct stack_layout *stack = setup_exception( context, raise_generic_exception ); + struct stack_layout *stack = setup_exception( context ); switch(get_trap_code(context)) { @@ -2189,6 +2198,8 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } + + setup_raise_exception( context, stack, raise_generic_exception ); } @@ -2205,8 +2216,9 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) init_handler( sigcontext, &fs, &gs ); if (!dispatch_signal(SIGINT)) { - struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = CONTROL_C_EXIT; + setup_raise_exception( sigcontext, stack, raise_generic_exception ); } } @@ -2217,9 +2229,10 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; stack->rec.ExceptionFlags = EH_NONCONTINUABLE; + setup_raise_exception( sigcontext, stack, raise_generic_exception ); }

1 0