Paul Vriens : comctl32/tests: Fix shell32 test failures on NT4/W2K.

[Alexandre Julliard]

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

Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com>
Date:   Sat Nov 20 17:42:38 2010 +0100

comctl32/tests: Fix shell32 test failures on NT4/W2K.

---

 dlls/comctl32/tests/propsheet.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c
index d687003..42cb4c8 100644
--- a/dlls/comctl32/tests/propsheet.c
+++ b/dlls/comctl32/tests/propsheet.c
@@ -621,12 +621,12 @@ static const struct message property_sheet_seq[] = {
     { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
     { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
     { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
-    { WM_ACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_ACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
     { WM_ACTIVATE, sent|id, 0, 0, RECEIVER_PAGE },
     { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
     { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_PAGE },
     { WM_DESTROY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
-    { WM_DESTROY, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_DESTROY, sent|id, 0, 0, RECEIVER_PAGE },*/
     /*{ WM_NCDESTROY, sent|id, 0, 0, RECEIVER_PAGE },
     { WM_NCDESTROY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
     { 0 }
@@ -663,13 +663,6 @@ static LRESULT CALLBACK sheet_callback_messages_proc (HWND hwnd, UINT msg, WPARA
 {
     save_message(hwnd, msg, wParam, lParam, RECEIVER_SHEET_WINPROC);
 
-    switch (msg)
-    {
-    case WM_CTLCOLORSTATIC:
-        keybd_event(VK_ESCAPE, 0, 0, 0);
-        break;
-    }
-
     return CallWindowProc (oldWndProc, hwnd, msg, wParam, lParam);
 }
 
@@ -719,7 +712,7 @@ static void test_messages(void)
     memset(&psh, 0, sizeof(psh));
     psh.dwSize = sizeof(psh);
     psh.dwFlags = PSH_NOAPPLYNOW | PSH_WIZARD | PSH_USECALLBACK
-                  /*| PSH_MODELESS */ | PSH_USEICONID;
+                  | PSH_MODELESS | PSH_USEICONID;
     psh.pszCaption = "test caption";
     psh.nPages = 1;
     psh.hwndParent = GetDesktopWindow();