Commit 5a5a9bcd authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

riched20: Remove unneeded casts.

parent 8caed63e
...@@ -628,9 +628,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ...@@ -628,9 +628,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre
int nEventMask = editor->nEventMask; int nEventMask = editor->nEventMask;
ME_InStream inStream; ME_InStream inStream;
TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, (UINT)format); TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, format);
editor->nEventMask = 0; editor->nEventMask = 0;
ME_GetSelection(editor, &from, &to); ME_GetSelection(editor, &from, &to);
if ((format & SFF_SELECTION) && (editor->mode & TM_RICHTEXT)) { if ((format & SFF_SELECTION) && (editor->mode & TM_RICHTEXT)) {
style = ME_GetSelectionInsertStyle(editor); style = ME_GetSelectionInsertStyle(editor);
...@@ -1140,7 +1140,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) ...@@ -1140,7 +1140,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y)
int seltype = 0; int seltype = 0;
if(!editor->lpOleCallback) if(!editor->lpOleCallback)
return FALSE; return FALSE;
ME_GetSelection(editor, (int *)&selrange.cpMin, (int *)&selrange.cpMax); ME_GetSelection(editor, &selrange.cpMin, &selrange.cpMax);
if(selrange.cpMin == selrange.cpMax) if(selrange.cpMin == selrange.cpMax)
seltype |= SEL_EMPTY; seltype |= SEL_EMPTY;
else else
...@@ -1561,7 +1561,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ...@@ -1561,7 +1561,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
case EM_EXGETSEL: case EM_EXGETSEL:
{ {
CHARRANGE *pRange = (CHARRANGE *)lParam; CHARRANGE *pRange = (CHARRANGE *)lParam;
ME_GetSelection(editor, (int *)&pRange->cpMin, (int *)&pRange->cpMax); ME_GetSelection(editor, &pRange->cpMin, &pRange->cpMax);
TRACE("EM_EXGETSEL = (%d,%d)\n", pRange->cpMin, pRange->cpMax); TRACE("EM_EXGETSEL = (%d,%d)\n", pRange->cpMin, pRange->cpMax);
return 0; return 0;
} }
...@@ -2034,11 +2034,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ...@@ -2034,11 +2034,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
LPDATAOBJECT dataObj = NULL; LPDATAOBJECT dataObj = NULL;
CHARRANGE range; CHARRANGE range;
HRESULT hr = S_OK; HRESULT hr = S_OK;
if (editor->cPasswordMask) if (editor->cPasswordMask)
return 0; /* Copying or Cutting masked text isn't allowed */ return 0; /* Copying or Cutting masked text isn't allowed */
ME_GetSelection(editor, (int*)&range.cpMin, (int*)&range.cpMax); ME_GetSelection(editor, &range.cpMin, &range.cpMax);
if(editor->lpOleCallback) if(editor->lpOleCallback)
hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj);
if(FAILED(hr) || !dataObj) if(FAILED(hr) || !dataObj)
......
...@@ -162,7 +162,7 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *me, CHARRANGE *lpchrg, ...@@ -162,7 +162,7 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *me, CHARRANGE *lpchrg,
if(!lplpdataobj) if(!lplpdataobj)
return E_INVALIDARG; return E_INVALIDARG;
if(!lpchrg) { if(!lpchrg) {
ME_GetSelection(This->editor, (int*)&tmpchrg.cpMin, (int*)&tmpchrg.cpMax); ME_GetSelection(This->editor, &tmpchrg.cpMin, &tmpchrg.cpMax);
lpchrg = &tmpchrg; lpchrg = &tmpchrg;
} }
return ME_GetDataObject(This->editor, lpchrg, lplpdataobj); return ME_GetDataObject(This->editor, lpchrg, lplpdataobj);
......
...@@ -262,12 +262,12 @@ void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) ...@@ -262,12 +262,12 @@ void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048])
p += sprintf(p, "N/A"); p += sprintf(p, "N/A");
if (pFmt->dwMask & CFM_SIZE) if (pFmt->dwMask & CFM_SIZE)
p += sprintf(p, "\nFont size: %d\n", (int)pFmt->yHeight); p += sprintf(p, "\nFont size: %d\n", pFmt->yHeight);
else else
p += sprintf(p, "\nFont size: N/A\n"); p += sprintf(p, "\nFont size: N/A\n");
if (pFmt->dwMask & CFM_OFFSET) if (pFmt->dwMask & CFM_OFFSET)
p += sprintf(p, "Char offset: %d\n", (int)pFmt->yOffset); p += sprintf(p, "Char offset: %d\n", pFmt->yOffset);
else else
p += sprintf(p, "Char offset: N/A\n"); p += sprintf(p, "Char offset: N/A\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment