From cc0ea85c347515b9446936241b2fe53f5088bc27 Mon Sep 17 00:00:00 2001
From: James Hawkins <jhawkins@codeweavers.com>
Date: Mon, 8 Sep 2008 05:38:33 -0500
Subject: [PATCH] comctl32: Store the previous timeout value to test with.

---
 dlls/comctl32/tests/header.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c
index 536d0d152f0..4a6c54a49d8 100644
--- a/dlls/comctl32/tests/header.c
+++ b/dlls/comctl32/tests/header.c
@@ -999,7 +999,7 @@ static void test_hdm_imageMessages(HWND hParent)
 static void test_hdm_filterMessages(HWND hParent)
 {
     HWND hChild;
-    int retVal;
+    int retVal, timeout;
 
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
     hChild = create_custom_header_control(hParent, TRUE);
@@ -1007,21 +1007,27 @@ static void test_hdm_filterMessages(HWND hParent)
     ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq,
                                     "adder header control to parent", FALSE);
 
+    timeout = SendMessage(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, 100);
+    SendMessage(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, timeout);
+
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    /* msdn incorrectly states that return value
+     * is the index of the filter control being
+     * modified. The sendMessage here should
+     * return previous filter timeout value
+     */
+
+    retVal = SendMessage(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, 100);
+    expect(timeout, retVal);
+
     todo_wine
     {
-     /* msdn incorrectly states that return value
-      * is the index of the filter control being
-      * modified. The sendMessage here should
-      * return previous filter timeout value
-     */
-        retVal = SendMessage(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, 100);
-        expect(1000, retVal);
         retVal = SendMessage(hChild, HDM_CLEARFILTER, 0, 1);
         expect(1, retVal);
         retVal = SendMessage(hChild, HDM_EDITFILTER, 1, 0);
         expect(1, retVal);
-     }
+    }
     if (winetest_interactive)
          ok_sequence(sequences, HEADER_SEQ_INDEX, filterMessages_seq_interactive,
                      "filterMessages sequence testing", TRUE);
-- 
2.11.4.GIT