mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From 81a36b530261731d6020e09770237ae5bf58166d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
|
Date: Fri, 2 May 2014 20:46:19 +0200
|
|
Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
|
|
|
|
---
|
|
dlls/user32/tests/msg.c | 2 ++
|
|
dlls/win32u/message.c | 2 +-
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
|
|
index 4519da6962d..304a3b87f46 100644
|
|
--- a/dlls/user32/tests/msg.c
|
|
+++ b/dlls/user32/tests/msg.c
|
|
@@ -10709,6 +10709,7 @@ static void test_timers(void)
|
|
start = GetTickCount();
|
|
while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
|
|
DispatchMessageA(&msg);
|
|
+todo_wine
|
|
ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
|
|
|| broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
|
|
|| broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
|
|
@@ -10779,6 +10780,7 @@ static void test_timers_no_wnd(void)
|
|
start = GetTickCount();
|
|
while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
|
|
DispatchMessageA(&msg);
|
|
+todo_wine
|
|
ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
|
|
|| broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
|
|
|| broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */,
|
|
diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
|
|
index d00178e6aa4..513150a3d61 100644
|
|
--- a/dlls/win32u/message.c
|
|
+++ b/dlls/win32u/message.c
|
|
@@ -170,7 +170,7 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME
|
|
|
|
if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE );
|
|
|
|
- timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM );
|
|
+ timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM );
|
|
|
|
SERVER_START_REQ( set_win_timer )
|
|
{
|
|
--
|
|
2.35.1
|
|
|