riched20: Use ME_GetSelectionType() in ME_ShowContextMenu() for getting type of selection.

Signed-off-by: Jactry Zeng <jzeng@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

riched20: Use ME_GetSelectionType() in ME_ShowContextMenu() for getting type of selection.
5c2522d7 · Jactry Zeng · Alexandre Julliard · 915201a1 · 5c2522d7
Commit 5c2522d7 authored Apr 19, 2018 by Jactry Zeng Committed by Alexandre Julliard Apr 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 10 deletions

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

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -3005,19 +3005,12 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y)
 {
  CHARRANGE selrange;
  HMENU menu;
-  int seltype = 0;
+  int seltype;
  if(!editor->lpOleCallback || !editor->hWnd)
    return FALSE;
  ME_GetSelectionOfs(editor, &selrange.cpMin, &selrange.cpMax);
-  if(selrange.cpMin == selrange.cpMax)
+  seltype = ME_GetSelectionType(editor);
-    seltype |= SEL_EMPTY;
-  else
-  {
-    /* FIXME: Handle objects */
-    seltype |= SEL_TEXT;
-    if(selrange.cpMax-selrange.cpMin > 1)
-      seltype |= SEL_MULTICHAR;
-  }
  if(SUCCEEDED(IRichEditOleCallback_GetContextMenu(editor->lpOleCallback, seltype, NULL, &selrange, &menu)))
  {
    TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, editor->hwndParent, NULL);