comctl32: Test for window messages of a property sheet with custom dialog proc.

diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h
index 361ccdbf59887c24c54f76f9b430d24bfb36f7e4..1d78ffea94e8a279aa1abad39080970426a2916a 100644 (file)
--- a/dlls/comctl32/tests/msg.h
+++ b/dlls/comctl32/tests/msg.h
@@ -89,7 +89,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index,
     msg_seq->count++;
 }
 
-static void flush_sequence(struct msg_sequence **seg, int sequence_index)
+static inline void flush_sequence(struct msg_sequence **seg, int sequence_index)
 {
     struct msg_sequence *msg_seq = seg[sequence_index];
     HeapFree(GetProcessHeap(), 0, msg_seq->sequence);
@@ -97,7 +97,7 @@ static void flush_sequence(struct msg_sequence **seg, int sequence_index)
     msg_seq->count = msg_seq->size = 0;
 }
 
-static void flush_sequences(struct msg_sequence **seq, int n)
+static inline void flush_sequences(struct msg_sequence **seq, int n)
 {
     int i;
 

diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c
index bfbaaa0e7bd2f35899c27ee7293a6c25f378034d..d6870032a6e1bafd59345640eee97a0e54ed26e9 100644 (file)
--- a/dlls/comctl32/tests/propsheet.c
+++ b/dlls/comctl32/tests/propsheet.c
@@ -20,12 +20,13 @@
 
 #include <windows.h>
 #include <commctrl.h>
+#include "msg.h"
 
 #include "resources.h"
 
 #include "wine/test.h"
 
-static HWND parent;
+static HWND parenthwnd;
 static HWND sheethwnd;
 
 static LONG active_page = -1;
@@ -165,7 +166,7 @@ static int CALLBACK disableowner_callback(HWND hwnd, UINT msg, LPARAM lparam)
     {
     case PSCB_INITIALIZED:
       {
-        ok(IsWindowEnabled(parent) == 0, "parent window should be disabled\n");
+        ok(IsWindowEnabled(parenthwnd) == 0, "parent window should be disabled\n");
         PostQuitMessage(0);
         return FALSE;
       }
@@ -198,7 +199,7 @@ static void test_disableowner(void)
     INT_PTR p;
 
     register_parent_wnd_class();
-    parent = CreateWindowA("parent class", "", WS_CAPTION | WS_SYSMENU | WS_VISIBLE, 100, 100, 100, 100, GetDesktopWindow(), NULL, GetModuleHandleA(NULL), 0);
+    parenthwnd = CreateWindowA("parent class", "", WS_CAPTION | WS_SYSMENU | WS_VISIBLE, 100, 100, 100, 100, GetDesktopWindow(), NULL, GetModuleHandleA(NULL), 0);
 
     memset(&psp, 0, sizeof(psp));
     psp.dwSize = sizeof(psp);
@@ -216,15 +217,15 @@ static void test_disableowner(void)
     psh.dwFlags = PSH_USECALLBACK;
     psh.pszCaption = "test caption";
     psh.nPages = 1;
-    psh.hwndParent = parent;
+    psh.hwndParent = parenthwnd;
     U3(psh).phpage = hpsp;
     psh.pfnCallback = disableowner_callback;
 
     p = PropertySheetA(&psh);
     todo_wine
     ok(p == 0, "Expected 0, got %ld\n", p);
-    ok(IsWindowEnabled(parent) != 0, "parent window should be enabled\n");
-    DestroyWindow(parent);
+    ok(IsWindowEnabled(parenthwnd) != 0, "parent window should be enabled\n");
+    DestroyWindow(parenthwnd);
 }
 
 static INT_PTR CALLBACK nav_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -525,6 +526,220 @@ static void test_custom_default_button(void)
     DestroyWindow(hdlg);
 }
 
+#define RECEIVER_SHEET_CALLBACK 0
+#define RECEIVER_SHEET_WINPROC  1
+#define RECEIVER_PAGE           2
+
+#define NUM_MSG_SEQUENCES   1
+#define PROPSHEET_SEQ_INDEX 0
+
+static struct msg_sequence *sequences[NUM_MSG_SEQUENCES];
+static WNDPROC oldWndProc;
+
+static const struct message property_sheet_seq[] = {
+    { PSCB_PRECREATE, sent|id, 0, 0, RECEIVER_SHEET_CALLBACK },
+    { PSCB_INITIALIZED, sent|id, 0, 0, RECEIVER_SHEET_CALLBACK },
+    { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_NCCALCSIZE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_WINDOWPOSCHANGED, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_MOVE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_SIZE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_GETTEXT, 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_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_NCCALCSIZE, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC },
+    { DM_REPOSITION, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_NCACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_GETTEXT, 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_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_GETTEXT, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_ACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_IME_SETCONTEXT, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_IME_NOTIFY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_SETFOCUS, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_KILLFOCUS, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_IME_SETCONTEXT, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_PARENTNOTIFY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_INITDIALOG, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_PAGE },
+    /*{ WM_NCCALCSIZE, sent|id, 0, 0, RECEIVER_PAGE },*/
+    { WM_CHILDACTIVATE, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_WINDOWPOSCHANGED, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_MOVE, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_SIZE, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_NOTIFY, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_STYLECHANGING, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_STYLECHANGED, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_GETTEXT, 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_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_SETTEXT, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_SHOWWINDOW, sent|id, 0, 0, RECEIVER_PAGE },
+    /*{ 0x00000401, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { 0x00000400, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_CHANGEUISTATE, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_UPDATEUISTATE, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_UPDATEUISTATE, sent|id|optional, 0, 0, RECEIVER_PAGE },
+    { WM_SHOWWINDOW, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_NCPAINT, 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_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_ERASEBKGND, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_CTLCOLORDLG, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_WINDOWPOSCHANGED, 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_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_PAINT, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_PAINT, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_NCPAINT, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_ERASEBKGND, sent|id, 0, 0, RECEIVER_PAGE },*/
+    { WM_CTLCOLORDLG, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_CTLCOLORSTATIC, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_CTLCOLORSTATIC, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_CTLCOLORBTN, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_CTLCOLORBTN, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_CTLCOLORBTN, 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_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { WM_COMMAND, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_NOTIFY, sent|id|optional, 0, 0, RECEIVER_PAGE },
+    { WM_NOTIFY, sent|id|optional, 0, 0, RECEIVER_PAGE },
+    { WM_WINDOWPOSCHANGING, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC },
+    { WM_WINDOWPOSCHANGED, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC },
+    /*{ WM_NCACTIVATE, 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_GETICON, 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_NCDESTROY, sent|id, 0, 0, RECEIVER_PAGE },
+    { WM_NCDESTROY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/
+    { 0 }
+};
+
+static void save_message(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, INT receiver)
+{
+    struct message msg;
+
+    if (message < WM_USER &&
+        message != WM_GETICON &&
+        message != WM_GETTEXT &&
+        message != WM_IME_SETCONTEXT &&
+        message != WM_IME_NOTIFY &&
+        message != WM_PAINT &&
+        message != WM_ERASEBKGND &&
+        message != WM_SETCURSOR &&
+        (message < WM_NCCREATE || message > WM_NCMBUTTONDBLCLK) &&
+        (message < WM_MOUSEFIRST || message > WM_MOUSEHWHEEL) &&
+        message != 0x90)
+    {
+        /*trace("check_message: %04x, %04x\n", message, receiver);*/
+
+        msg.message = message;
+        msg.flags = sent|wparam|lparam|id;
+        msg.wParam = wParam;
+        msg.lParam = lParam;
+        msg.id = receiver;
+        add_message(sequences, PROPSHEET_SEQ_INDEX, &msg);
+    }
+}
+
+static LRESULT CALLBACK sheet_callback_messages_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    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);
+}
+
+static int CALLBACK sheet_callback_messages(HWND hwnd, UINT msg, LPARAM lParam)
+{
+    save_message(hwnd, msg, (WPARAM)NULL, lParam, RECEIVER_SHEET_CALLBACK);
+
+    switch (msg)
+    {
+    case PSCB_INITIALIZED:
+        oldWndProc = (WNDPROC)GetWindowLongPtr (hwnd, GWLP_WNDPROC);
+        SetWindowLongPtr (hwnd, GWLP_WNDPROC, (LONG_PTR)&sheet_callback_messages_proc);
+        return TRUE;
+    }
+
+    return TRUE;
+}
+
+static INT_PTR CALLBACK page_dlg_proc_messages(HWND hwnd, UINT msg, WPARAM wParam,
+                                               LPARAM lParam)
+{
+    save_message(hwnd, msg, wParam, lParam, RECEIVER_PAGE);
+
+    return FALSE;
+}
+
+static void test_messages(void)
+{
+    HPROPSHEETPAGE hpsp[1];
+    PROPSHEETPAGEA psp;
+    PROPSHEETHEADERA psh;
+    HWND hdlg;
+
+    init_msg_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    memset(&psp, 0, sizeof(psp));
+    psp.dwSize = sizeof(psp);
+    psp.dwFlags = 0;
+    psp.hInstance = GetModuleHandleA(NULL);
+    U(psp).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_MESSAGE_TEST);
+    U2(psp).pszIcon = NULL;
+    psp.pfnDlgProc = page_dlg_proc_messages;
+    psp.lParam = 0;
+
+    hpsp[0] = CreatePropertySheetPageA(&psp);
+
+    memset(&psh, 0, sizeof(psh));
+    psh.dwSize = sizeof(psh);
+    psh.dwFlags = PSH_NOAPPLYNOW | PSH_WIZARD | PSH_USECALLBACK
+                  /*| PSH_MODELESS */ | PSH_USEICONID;
+    psh.pszCaption = "test caption";
+    psh.nPages = 1;
+    psh.hwndParent = GetDesktopWindow();
+    U3(psh).phpage = hpsp;
+    psh.pfnCallback = sheet_callback_messages;
+
+    hdlg = (HWND)PropertySheetA(&psh);
+    if (hdlg == INVALID_HANDLE_VALUE)
+    {
+        win_skip("comctl32 4.70 needs dwSize adjustment\n");
+        psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP);
+        hdlg = (HWND)PropertySheetA(&psh);
+    }
+    ShowWindow(hdlg,SW_NORMAL);
+
+    ok_sequence(sequences, PROPSHEET_SEQ_INDEX, property_sheet_seq, "property sheet with custom window proc", TRUE);
+
+    DestroyWindow(hdlg);
+}
+
 START_TEST(propsheet)
 {
     test_title();
@@ -533,4 +748,5 @@ START_TEST(propsheet)
     test_wiznavigation();
     test_buttons();
     test_custom_default_button();
+    test_messages();
 }

diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h
index beabce5bcee394aa915821cb5036fd5dbc5aacc7..e5217f1e9a5450c08b46c11066ecb19864551adc 100644 (file)
--- a/dlls/comctl32/tests/resources.h
+++ b/dlls/comctl32/tests/resources.h
@@ -37,6 +37,7 @@
 #define IDD_PROP_PAGE_EXIT 33
 
 #define IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON 34
+#define IDD_PROP_PAGE_MESSAGE_TEST 35
 
 #define IDC_PS_EDIT1 1000
 #define IDC_PS_EDIT2 1001

diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc
index db76d5826793f95922cb9f0aa49dd70743ee1a49..76b36428a3d17a2c4928aa5053e4f1eff0b20c05 100644 (file)
--- a/dlls/comctl32/tests/rsrc.rc
+++ b/dlls/comctl32/tests/rsrc.rc
@@ -64,6 +64,13 @@ FONT 8, "MS Shell Dlg"
     LTEXT "This has been a test property sheet!", -1, 10, 6, 170, 8
 }
 
+IDD_PROP_PAGE_MESSAGE_TEST DIALOG DISCARDABLE  0, 0, 339, 179
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Message Test"
+BEGIN
+    LTEXT           "Some Text",-1,115,1,195,24
+END
+
 STRINGTABLE 
 {
     IDS_TBADD1           "abc"