December 2015 - Wine-commits

Alexandre Julliard : winex11: Add a helper function to check a motion event against the serial number.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 9d237f97fc94f7dcd8afe0763951c601be6449b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d237f97fc94f7dcd8afe0763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 17:42:01 2015 +0900 winex11: Add a helper function to check a motion event against the serial number. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e462b55..356343d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -520,6 +520,21 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) return grab_clipping_window( &rect ); } + +/*********************************************************************** + * is_old_motion_event + */ +static BOOL is_old_motion_event( unsigned long serial ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (!thread_data->warp_serial) return FALSE; + if ((long)(serial - thread_data->warp_serial) < 0) return TRUE; + thread_data->warp_serial = 0; /* we caught up now */ + return FALSE; +} + + /*********************************************************************** * send_mouse_input * @@ -1576,20 +1591,11 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - if (!hwnd) + if (!hwnd && is_old_motion_event( event->serial )) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (thread_data->warp_serial) - { - if ((long)(event->serial - thread_data->warp_serial) < 0) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); - return; - } - thread_data->warp_serial = 0; /* we caught up now */ - } + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); + return; } - send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1677,14 +1683,10 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) break; } - if (broken_rawevents && thread_data->warp_serial) + if (broken_rawevents && is_old_motion_event( xev->serial )) { - if ((long)(xev->serial - thread_data->warp_serial) < 0) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); - return; - } - thread_data->warp_serial = 0; /* we caught up now */ + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); + return; } TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );

1 0

Alexandre Julliard : winex11: Ignore EnterNotify events that are older than the last mouse wrap.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 49e1ba7d4ba31f2a16fa4527e8028fb876a7b026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e1ba7d4ba31f2a16fa4527e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 17:42:38 2015 +0900 winex11: Ignore EnterNotify events that are older than the last mouse wrap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 356343d..63d202c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1621,6 +1621,11 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; + if (is_old_motion_event( event->serial )) + { + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); + return; + } send_mouse_input( hwnd, event->window, event->state, &input ); }

1 0

Alexandre Julliard : kernel32: Also check OS version to detect old binaries in GlobalMemoryStatus.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 5468e37508661ab0740f0066f9e1d4eaaca78cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5468e37508661ab0740f0066f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 21:02:19 2015 +0900 kernel32: Also check OS version to detect old binaries in GlobalMemoryStatus. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 0c05de6..eeed785 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1436,7 +1436,8 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) lpBuffer->dwAvailPageFile = 2U*1024*1024*1024 - lpBuffer->dwAvailPhys - 1; /* limit page file size for really old binaries */ - if (nt->OptionalHeader.MajorSubsystemVersion < 4) + if (nt->OptionalHeader.MajorSubsystemVersion < 4 || + nt->OptionalHeader.MajorOperatingSystemVersion < 4) { if (lpBuffer->dwTotalPageFile > MAXLONG) lpBuffer->dwTotalPageFile = MAXLONG; if (lpBuffer->dwAvailPageFile > MAXLONG) lpBuffer->dwAvailPageFile = MAXLONG;

1 0

Stefan Dösinger : ddraw/tests: Test color keys on cube map surfaces.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 7e01f865ab092b4293800e7de7e2b57040f2db0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e01f865ab092b4293800e7de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 30 21:06:29 2015 +0100 ddraw/tests: Test color keys on cube map surfaces. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 24e7fc8..345550d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1613,6 +1613,7 @@ static void test_ck_default(void) static void test_ck_complex(void) { IDirectDrawSurface7 *surface, *mipmap, *tmp; + D3DDEVICEDESC7 device_desc; DDSCAPS2 caps = {DDSCAPS_COMPLEX, 0, 0, {0}}; DDSURFACEDESC2 surface_desc; IDirect3DDevice7 *device; @@ -1632,6 +1633,8 @@ static void test_ck_complex(void) DestroyWindow(window); return; } + hr = IDirect3DDevice7_GetCaps(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); hr = IDirect3DDevice7_GetDirect3D(device, &d3d); ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); @@ -1728,6 +1731,72 @@ static void test_ck_complex(void) refcount = IDirectDrawSurface7_Release(surface); ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + if (!(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Device does not support cubemaps.\n"); + goto cleanup; + } + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetColorKey(surface, DDCKEY_SRCBLT, &color_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + color_key.dwColorSpaceLowValue = 0x0000ff00; + color_key.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface7_SetColorKey(surface, DDCKEY_SRCBLT, &color_key); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &mipmap); + ok(SUCCEEDED(hr), "Failed to get attached surface, i %u, hr %#x.\n", i, hr); + + hr = IDirectDrawSurface7_GetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + color_key.dwColorSpaceLowValue = 0x000000ff; + color_key.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface7_SetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); + todo_wine ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + + color_key.dwColorSpaceLowValue = 0; + color_key.dwColorSpaceHighValue = 0; + hr = IDirectDrawSurface7_GetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); + todo_wine ok(SUCCEEDED(hr), "Failed to get color key, hr %#x.\n", hr); + todo_wine ok(color_key.dwColorSpaceLowValue == 0x000000ff, "Got unexpected value 0x%08x.\n", + color_key.dwColorSpaceLowValue); + todo_wine ok(color_key.dwColorSpaceHighValue == 0x000000ff, "Got unexpected value 0x%08x.\n", + color_key.dwColorSpaceHighValue); + + IDirectDrawSurface_AddRef(mipmap); + for (i = 0; i < 7; ++i) + { + hr = IDirectDrawSurface7_GetAttachedSurface(mipmap, &caps, &tmp); + ok(SUCCEEDED(hr), "Failed to get attached surface, i %u, hr %#x.\n", i, hr); + hr = IDirectDrawSurface7_GetColorKey(tmp, DDCKEY_SRCBLT, &color_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x, i %u.\n", hr, i); + + color_key.dwColorSpaceLowValue = 0x000000ff; + color_key.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface7_SetColorKey(tmp, DDCKEY_SRCBLT, &color_key); + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x, i %u.\n", hr, i); + + IDirectDrawSurface_Release(mipmap); + mipmap = tmp; + } + + IDirectDrawSurface7_Release(mipmap); + + refcount = IDirectDrawSurface7_Release(surface); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + +cleanup: IDirectDraw7_Release(ddraw); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Henri Verbeet : ddraw/tests: 64-bit ddraw doesn't support textures.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 2dca999e3393cb039d2aabebf7c83328925ab30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dca999e3393cb039d2aabebf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:25:43 2015 +0100 ddraw/tests: 64-bit ddraw doesn't support textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 345550d..8ab0972 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -24,6 +24,7 @@ #include "d3d.h" static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *guid, void **ddraw, REFIID iid, IUnknown *outer_unknown); +static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); static DEVMODEW registry_mode; struct vec2 @@ -4669,7 +4670,10 @@ static void test_texturemanage(void) ddsd.dwHeight = 4; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); - ok(hr == tests[i].hr, "Got unexpected, hr %#x, case %u.\n", hr, i); + if (tests[i].hr == DD_OK && is_ddraw64 && (tests[i].caps_in & DDSCAPS_TEXTURE)) + todo_wine ok(hr == E_NOINTERFACE, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, tests[i].hr); if (FAILED(hr)) continue; @@ -6379,13 +6383,12 @@ static void test_set_surface_desc(void) } hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); - ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr); + if (is_ddraw64 && (invalid_caps_tests[i].caps & DDSCAPS_TEXTURE)) + todo_wine ok(hr == E_NOINTERFACE, "Test %u: Got unexpected hr %#x.\n", i, hr); + else + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW, "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) - { - skip("Cannot create a %s surface, skipping vidmem SetSurfaceDesc test.\n", - invalid_caps_tests[i].name); - goto done; - } + continue; reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_LPSURFACE; @@ -6410,7 +6413,6 @@ static void test_set_surface_desc(void) IDirectDrawSurface7_Release(surface); } -done: ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); DestroyWindow(window); @@ -7058,7 +7060,8 @@ static void test_private_data(void) hal_caps.dwSize = sizeof(hal_caps); hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) == (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) + if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) == (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP) + && !is_ddraw64) { reset_ddsd(&surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT; @@ -7378,7 +7381,8 @@ static void test_mipmap_lock(void) hal_caps.dwSize = sizeof(hal_caps); hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) != (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) + if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) != (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP) + || is_ddraw64) { skip("Mipmapped textures not supported, skipping mipmap lock test.\n"); IDirectDraw7_Release(ddraw); @@ -7442,7 +7446,8 @@ static void test_palette_complex(void) hal_caps.dwSize = sizeof(hal_caps); hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) != (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) + if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) != (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP) + || is_ddraw64) { skip("Mipmapped textures not supported, skipping mipmap palette test.\n"); IDirectDraw7_Release(ddraw); @@ -8381,6 +8386,13 @@ static void test_resource_priority(void) surface_desc.ddsCaps.dwCaps = test_data[i].caps; surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + if (is_ddraw64 && (test_data[i].caps & DDSCAPS_TEXTURE)) + { + todo_wine ok(hr == E_NOINTERFACE, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + if (SUCCEEDED(hr)) + IDirectDrawSurface7_Release(surface); + continue; + } ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, type %s.\n", hr, test_data[i].name); /* Priority == NULL segfaults. */ @@ -8411,6 +8423,9 @@ static void test_resource_priority(void) IDirectDrawSurface7_Release(surface); } + if (is_ddraw64) + goto done; + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT;

1 0

Hugh McMaster : winex11.drv: Ctrl-Space should generate space, not 0.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: 598d334e73784ab686d460a59301bf9cdeff5719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598d334e73784ab686d460a59… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 1 21:38:00 2015 +1100 winex11.drv: Ctrl-Space should generate space, not 0. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3d68d66..47a9872 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2566,6 +2566,14 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); } + /* Ctrl-Space generates space on Windows */ + if (e.state == ControlMask && virtKey == VK_SPACE) + { + bufW[0] = ' '; + ret = 1; + goto found; + } + if (!e.keycode && virtKey != VK_NONAME) { WARN_(key)("Unknown virtual key %X !!!\n", virtKey);

1 0

Hugh McMaster : user32/tests: Add tests for VK_SPACE, Shift-Space and Ctrl-Space.
by Alexandre Julliard 01 Dec '15

01 Dec '15

Module: wine Branch: master Commit: c87a78bc949c5b497e58364053d29e18c305d3ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87a78bc949c5b497e5836405… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 1 21:38:01 2015 +1100 user32/tests: Add tests for VK_SPACE, Shift-Space and Ctrl-Space. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d662d6f..0d7c6d6 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1635,6 +1635,9 @@ static const struct tounicode_tests { 0, ctrl, '^', 1, {0x1e}}, { 0, ctrl, '_', 1, {0x1f}}, { 0, ctrl, '`', 0, {}}, + { VK_SPACE, 0, 0, 1, {' ',0}}, + { VK_SPACE, shift, 0, 1, {' ',0}}, + { VK_SPACE, ctrl, 0, 1, {' ',0}}, }; static void test_ToUnicode(void)

1 0