Andrew Talbot : riched20: Constify some variables.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 13 06:31:51 CDT 2007
Module: wine
Branch: master
Commit: 2e2efd448af87b783314eafedfb784b965edf010
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2efd448af87b783314eafedfb784b965edf010
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Sat Aug 11 16:07:50 2007 +0100
riched20: Constify some variables.
---
dlls/riched20/caret.c | 8 ++++----
dlls/riched20/clipboard.c | 10 +++++-----
dlls/riched20/editor.c | 2 +-
dlls/riched20/editor.h | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c
index f2ca595..24b65c0 100644
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
@@ -47,10 +47,10 @@ int ME_GetTextLength(ME_TextEditor *editor)
}
-int ME_GetTextLengthEx(ME_TextEditor *editor, GETTEXTLENGTHEX *how)
+int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how)
{
int length;
-
+
if (how->flags & GTL_PRECISE && how->flags & GTL_CLOSE)
return E_INVALIDARG;
if (how->flags & GTL_NUMCHARS && how->flags & GTL_NUMBYTES)
@@ -1148,8 +1148,8 @@ static int ME_GetSelCursor(ME_TextEditor *editor, int dir)
else
return 1;
}
-
-BOOL ME_UpdateSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor)
+
+BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor)
{
ME_Cursor old_anchor = editor->pCursors[1];
diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c
index 99d9503..376a2e5 100644
--- a/dlls/riched20/clipboard.c
+++ b/dlls/riched20/clipboard.c
@@ -45,7 +45,7 @@ typedef struct EnumFormatImpl {
UINT cur;
} EnumFormatImpl;
-static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc);
+static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc);
static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFIID riid, LPVOID *ppvObj)
{
@@ -147,7 +147,7 @@ static const IEnumFORMATETCVtbl VT_EnumFormatImpl = {
EnumFormatImpl_Clone
};
-static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFORMATETC **lplpformatetc)
+static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFORMATETC **lplpformatetc)
{
EnumFormatImpl *ret;
TRACE("\n");
@@ -325,7 +325,7 @@ static const IDataObjectVtbl VT_DataObjectImpl =
DataObjectImpl_EnumDAdvise
};
-static HGLOBAL get_unicode_text(ME_TextEditor *editor, CHARRANGE *lpchrg)
+static HGLOBAL get_unicode_text(ME_TextEditor *editor, const CHARRANGE *lpchrg)
{
int pars, len;
WCHAR *data;
@@ -369,7 +369,7 @@ static DWORD CALLBACK ME_AppendToHGLOBAL(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG
return 0;
}
-static HGLOBAL get_rtf_text(ME_TextEditor *editor, CHARRANGE *lpchrg)
+static HGLOBAL get_rtf_text(ME_TextEditor *editor, const CHARRANGE *lpchrg)
{
EDITSTREAM es;
ME_GlobalDestStruct gds;
@@ -383,7 +383,7 @@ static HGLOBAL get_rtf_text(ME_TextEditor *editor, CHARRANGE *lpchrg)
return gds.hData;
}
-HRESULT ME_GetDataObject(ME_TextEditor *editor, CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj)
+HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj)
{
DataObjectImpl *obj;
TRACE("(%p,%d,%d)\n", editor, lpchrg->cpMin, lpchrg->cpMax);
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 4cdb54a..740828f 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -782,7 +782,7 @@ ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int
static int
-ME_FindText(ME_TextEditor *editor, DWORD flags, CHARRANGE *chrg, const WCHAR *text, CHARRANGE *chrgText)
+ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCHAR *text, CHARRANGE *chrgText)
{
const int nLen = lstrlenW(text);
const int nTextLen = ME_GetTextLength(editor);
diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h
index f71842b..09083ce 100644
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -206,9 +206,9 @@ void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor);
void ME_InsertTableCellFromCursor(ME_TextEditor *editor, int nCursor);
void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars);
int ME_GetTextLength(ME_TextEditor *editor);
-int ME_GetTextLengthEx(ME_TextEditor *editor, GETTEXTLENGTHEX *how);
+int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how);
ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor);
-BOOL ME_UpdateSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor);
+BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor);
/* wrap.c */
void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp);
@@ -285,4 +285,4 @@ LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, int nStart, int
LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream);
/* clipboard.c */
-HRESULT ME_GetDataObject(ME_TextEditor *editor, CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj);
+HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj);
More information about the wine-cvs
mailing list