richedit: Avoid calling ITextHost_TxNotify with EN_MSGFILTER.

The documentation for TxNotify says that it is not called with the EN_MSGFILTER notification, so I made sure ME_FilterEvent didn't call this method.

richedit: Avoid calling ITextHost_TxNotify with EN_MSGFILTER.
bcd8dc93 · Dylan Smith · Alexandre Julliard · 956c296a · bcd8dc93 · bcd8dc93
Commit bcd8dc93 authored Mar 05, 2009 by Dylan Smith Committed by Alexandre Julliard Mar 06, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

editor.c dlls/riched20/editor.c +4 -1

txthost.c dlls/riched20/txthost.c +3 -2

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -2018,11 +2018,14 @@ ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam)
 {
    MSGFILTER msgf;

+    if (!editor->hWnd) return FALSE;
+    msgf.nmhdr.hwndFrom = editor->hWnd;
+    msgf.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID);
    msgf.nmhdr.code = EN_MSGFILTER;
    msgf.msg = msg;
    msgf.wParam = *wParam;
    msgf.lParam = *lParam;
-    if (ITextHost_TxNotify(editor->texthost, msgf.nmhdr.code, &msgf) == S_OK)
+    if (SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf))
        return FALSE;
    *wParam = msgf.wParam;
    *lParam = msgf.lParam;

--- a/dlls/riched20/txthost.c
+++ b/dlls/riched20/txthost.c
@@ -452,8 +452,6 @@ HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface,
    HWND parent = GetParent(hwnd);
    UINT id = GetWindowLongW(hwnd, GWLP_ID);

-    /* Note: EN_MSGFILTER is documented as not being sent to TxNotify */
-
    switch (iNotify)
    {
        case EN_DROPFILES:
@@ -492,6 +490,9 @@ HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface,
            SendMessageW(parent, WM_COMMAND, MAKEWPARAM(id, iNotify), (LPARAM)hwnd);
            break;

+        case EN_MSGFILTER:
+            FIXME("EN_MSGFILTER is documented as not being sent to TxNotify\n");
+            /* fall through */
        default:
            return E_FAIL;
    }