richedit: Use ITextHost interface in ME_LinkNotify.

Using the ITextHost interface allows this notification to be received for windowless richedit controls. Windowed richedit conrols have an ITextHost implementation that will fill in hwndFrom and idFrom, but these should probably be initialized to 0 for windowless richedit controls.

richedit: Use ITextHost interface in ME_LinkNotify.
0342ab0d · Dylan Smith · Alexandre Julliard · bc4633a2 · 0342ab0d · 0342ab0d
Commit 0342ab0d authored Sep 28, 2009 by Dylan Smith Committed by Alexandre Julliard Sep 28, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

caret.c dlls/riched20/caret.c +2 -0

editor.c dlls/riched20/editor.c +3 -3

wrap.c dlls/riched20/wrap.c +2 -0

No files found.
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
@@ -1537,6 +1537,8 @@ void ME_SendSelChange(ME_TextEditor *editor)
  if (!(editor->nEventMask & ENM_SELCHANGE))
    return;

+  sc.nmhdr.hwndFrom = NULL;
+  sc.nmhdr.idFrom = 0;
  sc.nmhdr.code = EN_SELCHANGE;
  ME_GetSelectionOfs(editor, &sc.chrg.cpMin, &sc.chrg.cpMax);
  sc.seltyp = SEL_EMPTY;

--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -2941,8 +2941,8 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM
  if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK &&
      cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK)
  { /* The clicked run has CFE_LINK set */
-    info.nmhdr.hwndFrom = editor->hWnd;
-    info.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID);
+    info.nmhdr.hwndFrom = NULL;
+    info.nmhdr.idFrom = 0;
    info.nmhdr.code = EN_LINK;
    info.msg = msg;
    info.wParam = wParam;
@@ -2950,7 +2950,7 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM
    cursor.nOffset = 0;
    info.chrg.cpMin = ME_GetCursorOfs(&cursor);
    info.chrg.cpMax = info.chrg.cpMin + cursor.pRun->member.run.strText->nLen;
-    SendMessageW(GetParent(editor->hWnd), WM_NOTIFY,info.nmhdr.idFrom, (LPARAM)&info);
+    ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info);
  }
 }


--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -776,6 +776,8 @@ ME_SendRequestResize(ME_TextEditor *editor, BOOL force)
    {
      REQRESIZE info;

+      info.nmhdr.hwndFrom = NULL;
+      info.nmhdr.idFrom = 0;
      info.nmhdr.code = EN_REQUESTRESIZE;
      info.rc = rc;
      info.rc.right = editor->nTotalWidth;