Propagate IsDialogMessage to the parent if the dialog has the
DS_CONTROL flag.
diff --git a/windows/dialog.c b/windows/dialog.c
index c5d40e0..92d4da1 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -1227,6 +1227,40 @@
return RetVal;
}
+/***********************************************************************
+ * DIALOG_FindMsgDestination
+ *
+ * The messages that IsDialogMessage send may not go to the dialog
+ * calling IsDialogMessage if that dialog is a child, and it has the
+ * DS_CONTROL style set.
+ * We propagate up until we hit a that does not have DS_CONTROL, or
+ * whose parent is not a dialog.
+ *
+ * This is undocumented behaviour.
+ */
+static HWND DIALOG_FindMsgDestination( HWND hwndDlg )
+{
+ while (GetWindowLongA(hwndDlg, GWL_STYLE) & DS_CONTROL)
+ {
+ WND *pParent;
+ HWND hParent = GetParent(hwndDlg);
+ if (!hParent) break;
+
+ pParent = WIN_FindWndPtr(hParent);
+ if (!pParent) break;
+
+ if (!(pParent->flags & WIN_ISDIALOG))
+ {
+ WIN_ReleaseWndPtr(pParent);
+ break;
+ }
+ WIN_ReleaseWndPtr(pParent);
+
+ hwndDlg = hParent;
+ }
+
+ return hwndDlg;
+}
/***********************************************************************
* DIALOG_IsDialogMessage
@@ -1257,6 +1291,8 @@
return TRUE;
}
+ hwndDlg = DIALOG_FindMsgDestination(hwndDlg);
+
switch(message)
{
case WM_KEYDOWN:
