Sebastian Lackner : user32: Implement SetCoalescableTimer and add basic tests.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: f00598a5522e549864d187343c5d11948428b2e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f00598a5522e549864d187343c...

Author: Sebastian Lackner <sebastian(a)fds-team.de>
Date:   Fri Apr 29 12:34:53 2016 +0200

user32: Implement SetCoalescableTimer and add basic tests.

Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 57b7a9937deb3f01960fc426f6cedf2b79fd7885)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/user32/message.c   | 13 +++++++++++--
 dlls/user32/tests/msg.c | 16 ++++++++++++++++
 dlls/user32/user32.spec |  1 +
 include/winuser.h       |  7 +++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index c538161..400e94e 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -4436,9 +4436,9 @@ BOOL WINAPI MessageBeep( UINT i )
 
 
 /***********************************************************************
- *		SetTimer (USER32.@)
+ *      SetCoalescableTimer (USER32.@)
  */
-UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc )
+UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance )
 {
     UINT_PTR ret;
     WNDPROC winproc = 0;
@@ -4468,6 +4468,15 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc )
 }
 
 
+/******************************************************************
+ *      SetTimer (USER32.@)
+ */
+UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc )
+{
+    return SetCoalescableTimer( hwnd, id, timeout, proc, TIMERV_DEFAULT_COALESCING );
+}
+
+
 /***********************************************************************
  *		SetSystemTimer (USER32.@)
  */
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index d44aca4..8e42d0d 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -1713,6 +1713,7 @@ static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD);
 static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
 static UINT_PTR (WINAPI *pSetSystemTimer)(HWND, UINT_PTR, UINT, TIMERPROC);
 static UINT_PTR (WINAPI *pKillSystemTimer)(HWND, UINT_PTR);
+static UINT_PTR (WINAPI *pSetCoalescableTimer)(HWND, UINT_PTR, UINT, TIMERPROC, ULONG);
 /* kernel32 functions */
 static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA);
 
@@ -1739,6 +1740,7 @@ static void init_procs(void)
     GET_PROC(user32, UpdateLayeredWindow)
     GET_PROC(user32, SetSystemTimer)
     GET_PROC(user32, KillSystemTimer)
+    GET_PROC(user32, SetCoalescableTimer)
 
     GET_PROC(kernel32, GetCPInfoExA)
 
@@ -8667,6 +8669,20 @@ static void test_timers_no_wnd(void)
     KillTimer(NULL, id);
     /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */
 
+    if (pSetCoalescableTimer)
+    {
+        count = 0;
+        id = pSetCoalescableTimer(NULL, 0, 0, callback_count, 0);
+        ok(id != 0, "SetCoalescableTimer failed with %u.\n", GetLastError());
+        start = GetTickCount();
+        while (GetTickCount()-start < 100 && GetMessageA(&msg, NULL, 0, 0))
+            DispatchMessageA(&msg);
+        ok(count > 1, "expected count > 1, got %d.\n", count);
+        KillTimer(NULL, id);
+    }
+    else
+        win_skip("SetCoalescableTimer not available.\n");
+
     /* Check what happens when we're running out of timers */
     for (i=0; i<sizeof(ids)/sizeof(ids[0]); i++)
     {
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index 9b409df..163ae46 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -620,6 +620,7 @@
 @ stdcall SetClassWord(long long long)
 @ stdcall SetClipboardData(long long)
 @ stdcall SetClipboardViewer(long)
+@ stdcall SetCoalescableTimer(long long long ptr long)
 # @ stub SetConsoleReserveKeys
 @ stdcall SetCursor(long)
 @ stub SetCursorContents
diff --git a/include/winuser.h b/include/winuser.h
index 8b1302c..2f917ee 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -2546,6 +2546,12 @@ typedef struct tagMINIMIZEDMETRICS {
 #define USER_TIMER_MINIMUM 0x0000000A
 #define USER_TIMER_MAXIMUM 0x7FFFFFFF
 
+/* SetCoalescableTimer() tolerances */
+#define TIMERV_DEFAULT_COALESCING   0
+#define TIMERV_NO_COALESCING        0xFFFFFFFF
+#define TIMERV_COALESCING_MIN       1
+#define TIMERV_COALESCING_MAX       0x7FFFFFF5
+
 /* AnimateWindow() flags */
 #define AW_SLIDE        0x00040000
 #define AW_ACTIVATE     0x00020000
@@ -3927,6 +3933,7 @@ WINUSERAPI ULONG_PTR   WINAPI SetClassLongPtrW(HWND,INT,LONG_PTR);
 WINUSERAPI WORD        WINAPI SetClassWord(HWND,INT,WORD);
 WINUSERAPI HANDLE      WINAPI SetClipboardData(UINT,HANDLE);
 WINUSERAPI HWND        WINAPI SetClipboardViewer(HWND);
+WINUSERAPI UINT_PTR    WINAPI SetCoalescableTimer(HWND,UINT_PTR,UINT,TIMERPROC,ULONG);
 WINUSERAPI HCURSOR     WINAPI SetCursor(HCURSOR);
 WINUSERAPI BOOL        WINAPI SetCursorPos(INT,INT);
 WINUSERAPI VOID        WINAPI SetDebugErrorLevel(DWORD);