From 447235f1dcb8a7af073cf8d9650c901370770989 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 27 Sep 2015 20:20:46 +0200
Subject: [PATCH] Pipelight: Mark test failures with todo_wine.

---
 ...se-minimum-SetTimer-interval-to-5-ms.patch | 33 +++++++++++++++----
 patches/patchinstall.sh                       |  4 +--
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch
index ef160532..9e965b84 100644
--- a/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch
+++ b/patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch
@@ -1,17 +1,18 @@
-From 70d9c625738a8c368e6276be3bed8baab9103083 Mon Sep 17 00:00:00 2001
+From 08d8e1c398ed6f3e237ad9fd3d29e10d09dcff3d 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: user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
 
 ---
- dlls/user32/message.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ dlls/user32/message.c   | 2 +-
+ dlls/user32/tests/msg.c | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/user32/message.c b/dlls/user32/message.c
-index be5d995..a371f72 100644
+index d122980..aec0938 100644
 --- a/dlls/user32/message.c
 +++ b/dlls/user32/message.c
-@@ -4439,7 +4439,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc )
+@@ -4443,7 +4443,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc )
  
      if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE );
  
@@ -20,6 +21,26 @@ index be5d995..a371f72 100644
  
      SERVER_START_REQ( set_win_timer )
      {
+diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
+index d92fbc7..dbaddb7 100644
+--- a/dlls/user32/tests/msg.c
++++ b/dlls/user32/tests/msg.c
+@@ -8521,6 +8521,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 */,
+@@ -8589,6 +8590,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 */,
+        "did not get expected count for minimum timeout (%d != ~%d).\n",
 -- 
-1.8.3.2
+2.5.1
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 002bfa36..2fa060a0 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -2161,8 +2161,8 @@ fi
 # Patchset Pipelight
 # |
 # | Modified files:
-# |   *	dlls/user32/message.c, dlls/wined3d/wined3d.spec, dlls/wined3d/wined3d_main.c, dlls/winex11.drv/init.c,
-# | 	dlls/winex11.drv/opengl.c, dlls/winex11.drv/x11drv.h
+# |   *	dlls/user32/message.c, dlls/user32/tests/msg.c, dlls/wined3d/wined3d.spec, dlls/wined3d/wined3d_main.c,
+# | 	dlls/winex11.drv/init.c, dlls/winex11.drv/opengl.c, dlls/winex11.drv/x11drv.h
 # |
 if test "$enable_Pipelight" -eq 1; then
 	patch_apply Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch