Michael Stefaniuc : riched20: Remove superfluous pointer casts.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d1a7e41b71cb12b102b68112e1250e8d84f7c7f4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d1a7e41b71cb12b102b68112e1...

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Fri Jan 30 10:40:02 2009 +0100

riched20: Remove superfluous pointer casts.

---

 dlls/riched20/clipboard.c    |    4 ++--
 dlls/riched20/reader.c       |    2 +-
 dlls/riched20/richole.c      |    2 +-
 dlls/riched20/string.c       |    6 +++---
 dlls/riched20/tests/editor.c |    6 +++---
 dlls/riched20/txthost.c      |    2 +-
 dlls/riched20/txtsrv.c       |    2 +-
 dlls/riched20/undo.c         |    2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c
index b26222d..648f0c5 100644
--- a/dlls/riched20/clipboard.c
+++ b/dlls/riched20/clipboard.c
@@ -54,7 +54,7 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII
 
     if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) {
         IEnumFORMATETC_AddRef(iface);
-        *ppvObj = (LPVOID)This;
+        *ppvObj = This;
         return S_OK;
     }
     *ppvObj = NULL;
@@ -170,7 +170,7 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r
 
     if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) {
         IDataObject_AddRef(iface);
-        *ppvObj = (LPVOID)This;
+        *ppvObj = This;
         return S_OK;
     }
     *ppvObj = NULL;
diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c
index 17f530d..3df7109 100644
--- a/dlls/riched20/reader.c
+++ b/dlls/riched20/reader.c
@@ -2727,7 +2727,7 @@ RTFFlushCPOutputBuffer(RTF_Info *info)
         info->dwCPOutputCount = 0;
 
         RTFPutUnicodeString(info, buffer, length);
-        heap_free((char *)buffer);
+        heap_free(buffer);
 }
 
 void
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 658f0d3..ee8ea60 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1694,7 +1694,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj)
         return 0;
     }
     TRACE("Created %p\n",reo);
-    *ppObj = (LPVOID) reo;
+    *ppObj = reo;
 
     return 1;
 }
diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c
index ee33214..0bd751c 100644
--- a/dlls/riched20/string.c
+++ b/dlls/riched20/string.c
@@ -357,12 +357,12 @@ LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz)
   assert(psz != NULL);
 
   if (unicode)
-    return (LPWSTR)psz;
+    return psz;
   else {
     WCHAR *tmp;
-    int nChars = MultiByteToWideChar(CP_ACP, 0, (char *)psz, -1, NULL, 0);
+    int nChars = MultiByteToWideChar(CP_ACP, 0, psz, -1, NULL, 0);
     if((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL)
-      MultiByteToWideChar(CP_ACP, 0, (char *)psz, -1, tmp, nChars);
+      MultiByteToWideChar(CP_ACP, 0, psz, -1, tmp, nChars);
     return tmp;
   }
 }
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index da284d4..29d3124 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -3407,7 +3407,7 @@ static void test_EM_SETTEXTEX(void)
   cls.cbWndExtra = 0;
   cls.hInstance = GetModuleHandleA(0);
   cls.hIcon = 0;
-  cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
+  cls.hCursor = LoadCursorA(0, IDC_ARROW);
   cls.hbrBackground = GetStockObject(WHITE_BRUSH);
   cls.lpszMenuName = NULL;
   cls.lpszClassName = "ParentTestClass";
@@ -5413,7 +5413,7 @@ static void test_eventMask(void)
     cls.cbWndExtra = 0;
     cls.hInstance = GetModuleHandleA(0);
     cls.hIcon = 0;
-    cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
+    cls.hCursor = LoadCursorA(0, IDC_ARROW);
     cls.hbrBackground = GetStockObject(WHITE_BRUSH);
     cls.lpszMenuName = NULL;
     cls.lpszClassName = "EventMaskParentClass";
@@ -5503,7 +5503,7 @@ static void test_WM_NOTIFY(void)
     cls.cbWndExtra = 0;
     cls.hInstance = GetModuleHandleA(0);
     cls.hIcon = 0;
-    cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
+    cls.hCursor = LoadCursorA(0, IDC_ARROW);
     cls.hbrBackground = GetStockObject(WHITE_BRUSH);
     cls.lpszMenuName = NULL;
     cls.lpszClassName = "WM_NOTIFY_ParentClass";
diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c
index dc000dc..5b52b9f 100644
--- a/dlls/riched20/txthost.c
+++ b/dlls/riched20/txthost.c
@@ -466,7 +466,7 @@ HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface,
         case EN_STOPNOUNDO:
         {
             /* FIXME: Verify this assumption that pv starts with NMHDR. */
-            NMHDR *info = (NMHDR*)pv;
+            NMHDR *info = pv;
             if (!info)
                 return E_FAIL;
 
diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c
index 0c3fc55..d7b915c 100644
--- a/dlls/riched20/txtsrv.c
+++ b/dlls/riched20/txtsrv.c
@@ -110,7 +110,7 @@ static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices * iface,
    TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv);
    *ppv = NULL;
    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextServices))
-      *ppv = (LPVOID)This;
+      *ppv = This;
 
    if (*ppv)
    {
diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c
index d845550..423a6d4 100644
--- a/dlls/riched20/undo.c
+++ b/dlls/riched20/undo.c
@@ -55,7 +55,7 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp
     return NULL;
   else
   {
-    ME_DisplayItem *pItem = (ME_DisplayItem *)ALLOC_OBJ(ME_UndoItem);
+    ME_DisplayItem *pItem = ALLOC_OBJ(ME_UndoItem);
     switch(type)
     {
     case diUndoPotentialEndTransaction: