Michael Stefaniuc : oleaut32: Cast to the correct type instead to void pointer.

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Thu Dec 12 23:56:47 2013 +0100

oleaut32: Cast to the correct type instead to void pointer.

---

 dlls/oleaut32/connpt.c     |   10 ++++------
 dlls/oleaut32/olefont.c    |   14 ++++++--------
 dlls/oleaut32/olepicture.c |    2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index 59768a0..1d7b05c 100644
--- a/dlls/oleaut32/connpt.c
+++ b/dlls/oleaut32/connpt.c
@@ -254,9 +254,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer(
   ConnectionPointImpl *This = impl_from_IConnectionPoint(iface);
   TRACE("(%p)->(%p)\n", This, ppCPC);
 
-  return IUnknown_QueryInterface(This->Obj,
-				 &IID_IConnectionPointContainer,
-				 (LPVOID)ppCPC);
+  return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC);
 }
 
 /************************************************************************
@@ -273,7 +271,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
   TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie);
 
   *pdwCookie = 0;
-  if(FAILED(IUnknown_QueryInterface(lpUnk, &This->iid, (LPVOID)&lpSink)))
+  if(FAILED(IUnknown_QueryInterface(lpUnk, &This->iid, (void**)&lpSink)))
     return CONNECT_E_CANNOTCONNECT;
 
   for(i = 0; i < This->maxSinks; i++) {
@@ -349,7 +347,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections(
 
   EnumObj = EnumConnectionsImpl_Construct((IUnknown*)This, This->nSinks, pCD);
   hr = IEnumConnections_QueryInterface(&EnumObj->IEnumConnections_iface,
-				  &IID_IEnumConnections, (LPVOID)ppEnum);
+                                       &IID_IEnumConnections, (void**)ppEnum);
   IEnumConnections_Release(&EnumObj->IEnumConnections_iface);
 
   HeapFree(GetProcessHeap(), 0, pCD);
@@ -623,7 +621,7 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid,
   if(!Obj) return E_OUTOFMEMORY;
 
   hr = IConnectionPoint_QueryInterface(&Obj->IConnectionPoint_iface,
-				       &IID_IConnectionPoint, (LPVOID)pCP);
+                                       &IID_IConnectionPoint, (void**)pCP);
   IConnectionPoint_Release(&Obj->IConnectionPoint_iface);
   return hr;
 }
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index c0925a2..ba873ec 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -414,7 +414,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID)
     while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) {
       IPropertyNotifySink *sink;
 
-      IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (LPVOID)&sink);
+      IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (void**)&sink);
       IPropertyNotifySink_OnChanged(sink, dispID);
       IPropertyNotifySink_Release(sink);
       IUnknown_Release(CD.pUnk);
@@ -440,7 +440,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID)
     while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) {
         IFontEventsDisp *disp;
 
-        IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (LPVOID)&disp);
+        IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (void**)&disp);
         IFontEventsDisp_Invoke(disp, DISPID_FONT_CHANGED, &IID_NULL,
                                LOCALE_NEUTRAL, INVOKE_FUNC, &dispparams, NULL,
                                NULL, NULL);
@@ -1848,13 +1848,11 @@ static HRESULT WINAPI OLEFontImpl_FindConnectionPoint(
   TRACE("(%p)->(%s, %p)\n", this, debugstr_guid(riid), ppCp);
 
   if(IsEqualIID(riid, &IID_IPropertyNotifySink)) {
-    return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP,
-                                           &IID_IConnectionPoint,
-                                           (LPVOID)ppCp);
+    return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, &IID_IConnectionPoint,
+                                           (void**)ppCp);
   } else if(IsEqualIID(riid, &IID_IFontEventsDisp)) {
-    return IConnectionPoint_QueryInterface(this->pFontEventsCP,
-                                           &IID_IConnectionPoint,
-                                           (LPVOID)ppCp);
+    return IConnectionPoint_QueryInterface(this->pFontEventsCP, &IID_IConnectionPoint,
+                                           (void**)ppCp);
   } else {
     FIXME("no connection point for %s\n", debugstr_guid(riid));
     return CONNECT_E_NOCONNECTION;
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 5e81766..2139fde 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -923,7 +923,7 @@ static HRESULT WINAPI OLEPictureImpl_FindConnectionPoint(
       return E_POINTER;
   *ppCP = NULL;
   if (IsEqualGUID(riid,&IID_IPropertyNotifySink))
-      return IConnectionPoint_QueryInterface(This->pCP,&IID_IConnectionPoint,(LPVOID)ppCP);
+      return IConnectionPoint_QueryInterface(This->pCP, &IID_IConnectionPoint, (void**)ppCP);
   FIXME("no connection point for %s\n",debugstr_guid(riid));
   return CONNECT_E_NOCONNECTION;
 }