oleaut32: Avoid casts from COM objects to interfaces.

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

oleaut32: Avoid casts from COM objects to interfaces.
a3c5c50b · Michael Stefaniuc · Alexandre Julliard · 502b9e9a · a3c5c50b · a3c5c50b
Commit a3c5c50b authored Sep 08, 2016 by Michael Stefaniuc Committed by Alexandre Julliard Sep 09, 2016
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

olefont.c dlls/oleaut32/olefont.c +4 -2

olepicture.c dlls/oleaut32/olepicture.c +2 -1

No files found.
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -1014,8 +1014,10 @@ static HRESULT WINAPI OLEFontImpl_Clone(

  newObject->pPropertyNotifyCP = NULL;
  newObject->pFontEventsCP = NULL;
-  CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP);
-  CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP);
+  CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IPropertyNotifySink,
+                         &newObject->pPropertyNotifyCP);
+  CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IFontEventsDisp,
+                         &newObject->pFontEventsCP);

  if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP)
  {

--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -299,7 +299,8 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn)
  newObject->IConnectionPointContainer_iface.lpVtbl = &OLEPictureImpl_IConnectionPointContainer_VTable;

  newObject->pCP = NULL;
-  CreateConnectionPoint((IUnknown*)newObject,&IID_IPropertyNotifySink,&newObject->pCP);
+  CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink,
+                        &newObject->pCP);
  if (!newObject->pCP)
  {
    HeapFree(GetProcessHeap(), 0, newObject);