Andrew Talbot : riched20: Remove unneeded casts.
Alexandre Julliard
julliard at winehq.org
Thu Jan 17 08:48:34 CST 2008
Module: wine
Branch: master
Commit: 5a5a9bcd5dd033b3374c15247aca34c74eb6a15f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5a9bcd5dd033b3374c15247aca34c74eb6a15f
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Wed Jan 16 21:57:25 2008 +0000
riched20: Remove unneeded casts.
---
dlls/riched20/editor.c | 14 +++++++-------
dlls/riched20/richole.c | 2 +-
dlls/riched20/style.c | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 1780541..4e7c820 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -628,9 +628,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre
int nEventMask = editor->nEventMask;
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;
-
+
ME_GetSelection(editor, &from, &to);
if ((format & SFF_SELECTION) && (editor->mode & TM_RICHTEXT)) {
style = ME_GetSelectionInsertStyle(editor);
@@ -1140,7 +1140,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y)
int seltype = 0;
if(!editor->lpOleCallback)
return FALSE;
- ME_GetSelection(editor, (int *)&selrange.cpMin, (int *)&selrange.cpMax);
+ ME_GetSelection(editor, &selrange.cpMin, &selrange.cpMax);
if(selrange.cpMin == selrange.cpMax)
seltype |= SEL_EMPTY;
else
@@ -1561,7 +1561,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
case EM_EXGETSEL:
{
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);
return 0;
}
@@ -2034,11 +2034,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
LPDATAOBJECT dataObj = NULL;
CHARRANGE range;
HRESULT hr = S_OK;
-
+
if (editor->cPasswordMask)
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)
hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj);
if(FAILED(hr) || !dataObj)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 9bd44aa..742323e 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -162,7 +162,7 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *me, CHARRANGE *lpchrg,
if(!lplpdataobj)
return E_INVALIDARG;
if(!lpchrg) {
- ME_GetSelection(This->editor, (int*)&tmpchrg.cpMin, (int*)&tmpchrg.cpMax);
+ ME_GetSelection(This->editor, &tmpchrg.cpMin, &tmpchrg.cpMax);
lpchrg = &tmpchrg;
}
return ME_GetDataObject(This->editor, lpchrg, lplpdataobj);
diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c
index ba7d6d3..06d76cf 100644
--- a/dlls/riched20/style.c
+++ b/dlls/riched20/style.c
@@ -262,12 +262,12 @@ void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048])
p += sprintf(p, "N/A");
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
p += sprintf(p, "\nFont size: N/A\n");
-
+
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
p += sprintf(p, "Char offset: N/A\n");
More information about the wine-cvs
mailing list