wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Zhiyi Zhang : win32u: Return -1 for NUMCOLORS with 8-bit display DCs.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: a1dda8c376e11ace204e8b97a9ba9344e400e2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1dda8c376e11ace204e8b97… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 18 14:55:48 2022 +0800 win32u: Return -1 for NUMCOLORS with 8-bit display DCs. According to tests, GetDeviceCaps(NUMCOLORS) returns -1 for display DCs when the current display mode is 8-bit on newer versions of Windows, which makes sense because lower bit depth display modes are actually emulated with 32-bit modes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52679 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 2 +- dlls/win32u/driver.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e595072c747..02bc6651dd3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -3,6 +3,7 @@ * * Copyright 2005 Huw Davies * Copyright 2008 Dmitry Timoshkov + * Copyright 2019-2022 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2314,7 +2315,6 @@ static void test_display_dc(void) value = GetDeviceCaps(hdc, NUMCOLORS); if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) - todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) ok(value == -1, "Expected -1, got %d.\n", value); else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) ok(value > 16 && value <= 256, "Got %d.\n", value); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 37d9333e522..175fde1fa40 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -294,7 +294,8 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = NtGdiGetDeviceCaps( dev->hdc, BITSPIXEL ); - return (bpp > 8) ? -1 : (1 << bpp); + /* Newer versions of Windows return -1 for 8-bit and higher */ + return (bpp > 4) ? -1 : (1 << bpp); case COLORRES: /* The observed correspondence between BITSPIXEL and COLORRES is: * BITSPIXEL: 8 -> COLORRES: 18

1 0

Zhiyi Zhang : user32/tests: Test NUMCOLORS for display DCs.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: bfed4330245fe08c72fb317db02f8eddfd305767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfed4330245fe08c72fb317d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 18 14:55:29 2022 +0800 user32/tests: Test NUMCOLORS for display DCs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 92 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index fdb13216ad9..e595072c747 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2187,8 +2187,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + unsigned char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + INT count, old_count, i, bpp, value; HBITMAP hbitmap, old_hbitmap; - INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; DISPLAY_DEVICEA dd; @@ -2241,7 +2243,95 @@ static void test_display_dc(void) winetest_pop_context(); } + /* Test selecting a DIB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + memset(buffer, 0, sizeof(buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = dm.dmPelsWidth; + bmi->bmiHeader.biHeight = dm.dmPelsHeight; + bmi->bmiHeader.biBitCount = bpps[i]; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + hbitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(!!hbitmap, "CreateDIBSection failed, error %ld.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + value = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(value == 32, "Expected 32, got %d.\n", value); + value = GetDeviceCaps(mem_dc, NUMCOLORS); + ok(value == -1, "Expected -1, got %d.\n", value); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test NUMCOLORS for display DCs */ + for (i = ARRAY_SIZE(bpps) - 1; i >= 0; --i) + { + winetest_push_context("bpp %d", bpps[i]); + + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + if (bpps[i] == dm.dmBitsPerPel) + { + res = DISP_CHANGE_SUCCESSFUL; + } + else + { + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel == bpps[i]) + break; + } + if (dm2.dmBitsPerPel != bpps[i]) + { + skip("%d-bit display mode not found.\n", bpps[i]); + winetest_pop_context(); + continue; + } + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); + } + + if (res == DISP_CHANGE_SUCCESSFUL) + { + value = GetDeviceCaps(hdc, BITSPIXEL); + ok(value == (bpps[i] == 4 ? 1 : bpps[i]), "Expected %d, got %d.\n", + (bpps[i] == 4 ? 1 : bpps[i]), value); + + value = GetDeviceCaps(hdc, NUMCOLORS); + if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) + todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) + ok(value == -1, "Expected -1, got %d.\n", value); + else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) + ok(value > 16 && value <= 256, "Got %d.\n", value); + else + ok(value == 1 << bpps[i], "Expected %d, got %d.\n", 1 << bpps[i], value); + } + winetest_pop_context(); + } + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); + /* Test selecting a DDB of the same color depth into a display compatible DC */ + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + mem_dc = CreateCompatibleDC(hdc); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm.dmBitsPerPel, "Expected bpp %ld, got %d.\n", dm.dmBitsPerPel, bpp);

1 0

Zhiyi Zhang : user32/tests: Avoid unnecessary display mode changes.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 6c784f2c4648f12b75309aa3d2f1801bb0ac8528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c784f2c4648f12b75309aa3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 18 14:55:14 2022 +0800 user32/tests: Avoid unnecessary display mode changes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d0d4ff1f324..fdb13216ad9 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -484,8 +484,6 @@ static void test_ChangeDisplaySettingsEx(void) } if (pSetThreadDpiAwarenessContext && context) pSetThreadDpiAwarenessContext(context); - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %ld\n", res); /* Save the original mode for all devices so that they can be restored at the end of tests */ device_count = 0; @@ -568,10 +566,6 @@ static void test_ChangeDisplaySettingsEx(void) broken(res == DISP_CHANGE_BADPARAM) || /* win10 */ broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ "ChangeDisplaySettingsExA %s returned unexpected %ld\n", devices[0].name, res); - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL || - broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ - "ChangeDisplaySettingsExA %s returned unexpected %ld\n", devices[0].name, res); } /* Test that only specifying DM_POSITION in dmFields is not enough to detach an adapter */ @@ -2260,34 +2254,13 @@ static void test_display_dc(void) SelectObject(mem_dc, old_hbitmap); DeleteDC(mem_dc); - /* Tests after mode changes to a different resolution */ - memset(&dm2, 0, sizeof(dm2)); - dm2.dmSize = sizeof(dm2); - for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) - { - if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) - break; - } - ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, - "Failed to find a different resolution.\n"); - - res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ - "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); - if (res == DISP_CHANGE_SUCCESSFUL) - { - check_display_dc(hdc, &dm2, FALSE); - - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); - } - - /* Tests after mode changes to a different color depth */ + /* Tests after mode changes to a mode with different resolution and color depth */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) { - if (dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight && + dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) break; } if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) @@ -2357,7 +2330,7 @@ static void test_display_dc(void) } else { - win_skip("Failed to find a different color depth other than %lu.\n", dm.dmBitsPerPel); + win_skip("Failed to find a required display mode.\n"); } if (hbitmap)

1 0

Timo Zuccarello : winex11.drv: Do not assign reserved virtual key 0xE0 to key codes.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: a54755c87c0f12041585923cf09af7d239fb3e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a54755c87c0f12041585923c… Author: Timo Zuccarello <timo(a)zuccarello.eu> Date: Wed Apr 13 16:04:18 2022 +0200 winex11.drv: Do not assign reserved virtual key 0xE0 to key codes. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 786b6f4e084..170231c0026 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1579,7 +1579,8 @@ void X11DRV_InitKeyboard( Display *display ) WORD first, last; } vkey_ranges[] = { { VK_OEM_1, VK_OEM_3 }, - { VK_OEM_4, VK_ICO_00 }, + { VK_OEM_4, VK_OEM_8 }, + { VK_OEM_AX, VK_ICO_00 }, { 0xe6, 0xe6 }, { 0xe9, 0xf5 }, { VK_OEM_NEC_EQUAL, VK_OEM_NEC_EQUAL },

1 0

Zebediah Figura : user32: Do not call the lparam for WM_SYSTIMER messages.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: ea4353858d96235f362c5f94c9c5e0e83ad04edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4353858d96235f362c5f94… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:33 2022 -0500 user32: Do not call the lparam for WM_SYSTIMER messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 376ff2193e3..990323dde65 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -861,22 +861,19 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) LRESULT retval; /* Process timer messages */ - if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) + if (msg->lParam && msg->message == WM_TIMER) { - if (msg->lParam) + __TRY { - __TRY - { - retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, - msg->message, msg->wParam, GetTickCount() ); - } - __EXCEPT_ALL - { - retval = 0; - } - __ENDTRY - return retval; + retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, + msg->message, msg->wParam, GetTickCount() ); + } + __EXCEPT_ALL + { + retval = 0; } + __ENDTRY + return retval; } return NtUserDispatchMessageA( msg ); }

1 0

Zebediah Figura : win32u: Do not call the lparam for WM_SYSTIMER messages.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 019313b63e9a4b70bae519675d1940f503e6f1a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=019313b63e9a4b70bae51967… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:32 2022 -0500 win32u: Do not call the lparam for WM_SYSTIMER messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 324df280b8d..02644e71929 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2451,7 +2451,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) LRESULT retval = 0; /* Process timer messages */ - if (msg->lParam && (msg->message == WM_TIMER || msg->message == WM_SYSTIMER)) + if (msg->lParam && msg->message == WM_TIMER) { params.func = (WNDPROC)msg->lParam; params.result = &retval; /* FIXME */

1 0

Zebediah Figura : win32u: Remove the "proc" parameter to NtUserSetSystemTimer().
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 5e4dedff8e062fb21e0719ccbbbb5d5ca53cec75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4dedff8e062fb21e0719cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:31 2022 -0500 win32u: Remove the "proc" parameter to NtUserSetSystemTimer(). Testing on 32-bit Windows 10 suggests that the function only has three parameters. The test fixed in this patch (which still succeeds on e.g. Windows 2003) suggests that the final parameter to SetSystemTimer() is not a callback, either. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/user32/caret.c | 4 ++-- dlls/user32/input.c | 2 +- dlls/user32/listbox.c | 2 +- dlls/user32/message.c | 11 +++++++++++ dlls/user32/scroll.c | 8 ++++---- dlls/user32/tests/msg.c | 3 +-- dlls/user32/user32.spec | 2 +- dlls/win32u/message.c | 8 +++----- dlls/win32u/win32u.spec | 2 +- dlls/wow64win/user.c | 3 +-- include/ntuser.h | 2 +- include/winuser.h | 2 +- 13 files changed, 29 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e4dedff8e062fb21e07…

1 0

Zebediah Figura : user32: Update mouse tracking information based on the timer ID in DispatchMessage().
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 079b0423b5b2fe321b8cae76c61c1bc47b24ac64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=079b0423b5b2fe321b8cae76… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:30 2022 -0500 user32: Update mouse tracking information based on the timer ID in DispatchMessage(). Avoid passing a callback to NtUserSetSystemTimer(); it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 27 +++++++++------------------ dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 1 + dlls/win32u/message.c | 5 +++++ dlls/win32u/ntuser_private.h | 2 ++ 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 5a1d82eb7a7..6c0eb82b04f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -527,7 +527,6 @@ typedef struct __TRACKINGLIST { /* FIXME: move tracking stuff into a per thread data */ static _TRACKINGLIST tracking_info; -static UINT_PTR timer; static void check_mouse_leave(HWND hwnd, int hittest) { @@ -564,13 +563,12 @@ static void check_mouse_leave(HWND hwnd, int hittest) } } -static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, - DWORD dwTime) +void CDECL update_mouse_tracking_info( HWND hwnd ) { POINT pos; INT hoverwidth = 0, hoverheight = 0, hittest; - TRACE("hwnd %p, msg %04x, id %04lx, time %u\n", hwnd, uMsg, idEvent, dwTime); + TRACE( "hwnd %p\n", hwnd ); GetCursorPos(&pos); hwnd = WINPOS_WindowFromPoint(hwnd, pos, &hittest); @@ -632,8 +630,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, /* stop the timer if the tracking list is empty */ if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; + KillSystemTimer( tracking_info.tme.hwndTrack, SYSTEM_TIMER_TRACK_MOUSE ); tracking_info.tme.hwndTrack = 0; tracking_info.tme.dwFlags = 0; tracking_info.tme.dwHoverTime = 0; @@ -718,8 +715,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) /* if we aren't tracking on hover or leave remove this entry */ if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; + KillSystemTimer( tracking_info.tme.hwndTrack, SYSTEM_TIMER_TRACK_MOUSE ); tracking_info.tme.hwndTrack = 0; tracking_info.tme.dwFlags = 0; tracking_info.tme.dwHoverTime = 0; @@ -732,14 +728,10 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) if (tracking_info.tme.dwFlags & TME_LEAVE && tracking_info.tme.hwndTrack != NULL) check_mouse_leave(hwnd, hittest); - if (timer) - { - KillSystemTimer(tracking_info.tme.hwndTrack, timer); - timer = 0; - tracking_info.tme.hwndTrack = 0; - tracking_info.tme.dwFlags = 0; - tracking_info.tme.dwHoverTime = 0; - } + KillSystemTimer( tracking_info.tme.hwndTrack, SYSTEM_TIMER_TRACK_MOUSE ); + tracking_info.tme.hwndTrack = 0; + tracking_info.tme.dwFlags = 0; + tracking_info.tme.dwHoverTime = 0; if (ptme->hwndTrack == hwnd) { @@ -750,8 +742,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) /* Initialize HoverInfo variables even if not hover tracking */ tracking_info.pos = pos; - timer = NtUserSetSystemTimer( tracking_info.tme.hwndTrack, (UINT_PTR)&tracking_info.tme, - hover_time, TrackMouseEventProc ); + NtUserSetSystemTimer( tracking_info.tme.hwndTrack, SYSTEM_TIMER_TRACK_MOUSE, hover_time, NULL ); } } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 6e0722e4750..08f2833ee3f 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -179,6 +179,7 @@ static const struct user_callbacks user_funcs = SCROLL_SetStandardScrollPainted, toggle_caret, unpack_dde_message, + update_mouse_tracking_info, register_imm, unregister_imm, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 96c47a71753..54b11f2a8ef 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -100,6 +100,7 @@ extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; extern BOOL USER_IsExitingThread( DWORD tid ) DECLSPEC_HIDDEN; extern void CDECL toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; +extern void CDECL update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 7b3ad1d1f73..ba91d002d13 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2477,6 +2477,11 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) if (!user_callbacks) break; user_callbacks->toggle_caret( msg->hwnd ); return 0; + + case SYSTEM_TIMER_TRACK_MOUSE: + if (!user_callbacks) break; + user_callbacks->update_mouse_tracking_info( msg->hwnd ); + return 0; } } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 0ca4aef4868..604817708c7 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -54,6 +54,7 @@ struct user_callbacks void (CDECL *toggle_caret)( HWND hwnd ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); + void (CDECL *update_mouse_tracking_info)( HWND hwnd ); BOOL (WINAPI *register_imm)( HWND hwnd ); void (WINAPI *unregister_imm)( HWND hwnd ); }; @@ -63,6 +64,7 @@ struct user_callbacks enum system_timer_id { + SYSTEM_TIMER_TRACK_MOUSE = 0xfffa, SYSTEM_TIMER_CARET = 0xffff, };

1 0

Zebediah Figura : user32: Toggle the caret based on the timer ID in DispatchMessage().
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 95378c56b8efa5bdd1822e317995bb096d0bd711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95378c56b8efa5bdd1822e31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:29 2022 -0500 user32: Toggle the caret based on the timer ID in DispatchMessage(). Avoid passing a callback to NtUserSetSystemTimer(); it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 18 +++++++----------- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 1 + dlls/win32u/message.c | 11 +++++++++++ dlls/win32u/ntuser_private.h | 6 ++++++ 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 8bf4962b708..708f4e39f97 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "ntuser.h" +#include "user_private.h" #include "wine/server.h" #include "wine/debug.h" @@ -40,8 +41,6 @@ typedef struct static CARET Caret = { 0, 500 }; -#define TIMERID 0xffff /* system timer id for the caret */ - /***************************************************************** * CARET_DisplayCaret @@ -67,10 +66,7 @@ static void CARET_DisplayCaret( HWND hwnd, const RECT *r ) } -/***************************************************************** - * CARET_Callback - */ -static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD ctime) +void CDECL toggle_caret( HWND hwnd ) { BOOL ret; RECT r; @@ -183,7 +179,7 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) if (prev && !hidden) /* hide the previous one */ { /* FIXME: won't work if prev belongs to a different process */ - KillSystemTimer( prev, TIMERID ); + KillSystemTimer( prev, SYSTEM_TIMER_CARET ); if (old_state) CARET_DisplayCaret( prev, &r ); } @@ -226,7 +222,7 @@ BOOL WINAPI DestroyCaret(void) if (ret && prev && !hidden) { /* FIXME: won't work if prev belongs to a different process */ - KillSystemTimer( prev, TIMERID ); + KillSystemTimer( prev, SYSTEM_TIMER_CARET ); if (old_state) CARET_DisplayCaret( prev, &r ); } if (Caret.hBmp) DeleteObject( Caret.hBmp ); @@ -274,7 +270,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y ) r.left = x; r.top = y; CARET_DisplayCaret( hwnd, &r ); - NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); + NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_CARET, Caret.timeout, NULL ); } return ret; } @@ -314,7 +310,7 @@ BOOL WINAPI HideCaret( HWND hwnd ) if (ret && !hidden) { if (old_state) CARET_DisplayCaret( hwnd, &r ); - KillSystemTimer( hwnd, TIMERID ); + KillSystemTimer( hwnd, SYSTEM_TIMER_CARET ); } return ret; } @@ -352,7 +348,7 @@ BOOL WINAPI ShowCaret( HWND hwnd ) if (ret && (hidden == 1)) /* hidden was 1 so it's now 0 */ { CARET_DisplayCaret( hwnd, &r ); - NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback ); + NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_CARET, Caret.timeout, NULL ); } return ret; } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 242ee0c90fb..6e0722e4750 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -177,6 +177,7 @@ static const struct user_callbacks user_funcs = rawinput_device_get_usages, register_builtin_classes, SCROLL_SetStandardScrollPainted, + toggle_caret, unpack_dde_message, register_imm, unregister_imm, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 52e57a5e6f1..96c47a71753 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -99,6 +99,7 @@ extern HBRUSH SYSCOLOR_Get55AABrush(void) DECLSPEC_HIDDEN; extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; extern BOOL USER_IsExitingThread( DWORD tid ) DECLSPEC_HIDDEN; +extern void CDECL toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 400cc242156..7b3ad1d1f73 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2469,6 +2469,17 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) __ENDTRY return retval; } + if (msg->message == WM_SYSTIMER) + { + switch (msg->wParam) + { + case SYSTEM_TIMER_CARET: + if (!user_callbacks) break; + user_callbacks->toggle_caret( msg->hwnd ); + return 0; + } + } + if (!msg->hwnd) return 0; spy_enter_message( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, msg->wParam, msg->lParam ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 51c54bbe912..0ca4aef4868 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -51,6 +51,7 @@ struct user_callbacks BOOL (CDECL *rawinput_device_get_usages)(HANDLE handle, USHORT *usage_page, USHORT *usage); void (CDECL *register_builtin_classes)(void); void (WINAPI *set_standard_scroll_painted)( HWND hwnd, INT bar, BOOL visible ); + void (CDECL *toggle_caret)( HWND hwnd ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); BOOL (WINAPI *register_imm)( HWND hwnd ); @@ -60,6 +61,11 @@ struct user_callbacks #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 +enum system_timer_id +{ + SYSTEM_TIMER_CARET = 0xffff, +}; + struct user_object { HANDLE handle;

1 0

Zebediah Figura : user.exe: Implement SetSystemTimer() using SetTimer().
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 33087806a637b608367897310fda4b2b922e974b URL: https://source.winehq.org/git/wine.git/?a=commit;h=33087806a637b60836789731… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:28 2022 -0500 user.exe: Implement SetSystemTimer() using SetTimer(). Avoid using SetSystemTimer() to specify a callback; it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 5 +++++ dlls/user.exe16/user_private.h | 2 ++ dlls/user.exe16/window.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 819d9d9b837..46561d722ed 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1292,6 +1292,11 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT lParam = MAKELPARAM( 0, convert_handle_32_to_16( lParam, GMEM_DDESHARE )); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_TIMER: + if (wParam & SYSTEM_TIMER_FLAG) + msg = WM_SYSTIMER; + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + break; case SBM_SETRANGE: ret = callback( HWND_16(hwnd), SBM_SETRANGE16, 0, MAKELPARAM(wParam, lParam), result, arg ); break; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 8a325cf9fb2..0805997246b 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -95,6 +95,8 @@ extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPAR #define WM_SYSTIMER 0x0118 +#define SYSTEM_TIMER_FLAG 0x10000 + /* Dialog info structure (must match the user32 one) */ typedef struct tagDIALOGINFO { diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 590b8ae9f7c..e54dd6a803e 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -111,7 +111,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 pr UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 proc ) { TIMERPROC proc32 = (TIMERPROC)WINPROC_AllocProc16( (WNDPROC16)proc ); - return SetSystemTimer( WIN_Handle32(hwnd), id, timeout, proc32 ); + return SetTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG, timeout, proc32 ); } @@ -1087,7 +1087,7 @@ void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore ) */ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id ) { - return KillSystemTimer( WIN_Handle32(hwnd), id ); + return KillTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG ); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022