James Hawkins : comctl32: Fix several test failures in win2k.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3e8a63d5fa06146531002fac3bb2707ade814759
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3e8a63d5fa06146531002fac3bb2707ade814759

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Tue Sep 30 20:57:09 2008 -0500

comctl32: Fix several test failures in win2k.

---

 dlls/comctl32/tests/treeview.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index a873e3c..d0157d4 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -82,10 +82,10 @@ static const struct message DoFocusTestSeq[] = {
     { WM_NCCALCSIZE, sent|wparam, 0x00000001 },
     { WM_WINDOWPOSCHANGED, sent },
     { WM_SIZE, sent|defwinproc },
-    { WM_WINDOWPOSCHANGING, sent|defwinproc },
-    { WM_NCCALCSIZE, sent|wparam|defwinproc, 0x00000001 },
-    { WM_WINDOWPOSCHANGED, sent|defwinproc },
-    { WM_SIZE, sent|defwinproc },
+    { WM_WINDOWPOSCHANGING, sent|defwinproc|optional },
+    { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 0x00000001 },
+    { WM_WINDOWPOSCHANGED, sent|defwinproc|optional },
+    { WM_SIZE, sent|defwinproc|optional },
     { TVM_SELECTITEM, sent|wparam, 0x00000009 },
     /* The following end up out of order in wine */
     { WM_PAINT, sent|defwinproc },
@@ -149,8 +149,8 @@ static const struct message TestGetSetItemHeightSeq[] = {
     { TVM_SETITEMHEIGHT, sent|wparam|lparam, 0xffffffff, 0x00000000 },
     { TVM_GETITEMHEIGHT, sent|wparam|lparam, 0x00000000, 0x00000000 },
     { TVM_SETITEMHEIGHT, sent|lparam, 0xcccccccc, 0x00000000 },
-    { TVM_GETITEMHEIGHT, sent|wparam|lparam, 0x00000000, 0x00000000 },
-    { TVM_SETITEMHEIGHT, sent|wparam|lparam, 0x00000009, 0x00000000 },
+    { TVM_GETITEMHEIGHT, sent|wparam|lparam|optional, 0x00000000, 0x00000000 },
+    { TVM_SETITEMHEIGHT, sent|wparam|lparam|optional, 0x00000009, 0x00000000 },
     { WM_WINDOWPOSCHANGING, sent|defwinproc },
     { WM_NCCALCSIZE, sent|wparam|defwinproc, 0x00000001 },
     { WM_WINDOWPOSCHANGED, sent|defwinproc },