Commit 4281d19d authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

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

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