Skip to content

W
wine-cw
Commit d16c0dc6 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

oleaut32: Free connection point on destruction of the picture object.

Handle failure of CreateConnectionPoint on construction.
parent 1ce38682
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
dlls/oleaut32/olepicture.c
View file @ d16c0dc6
...@@ -279,7 +279,13 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) ...@@ -279,7 +279,13 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn)
newObject->lpvtblIPersistStream = &OLEPictureImpl_IPersistStream_VTable; newObject->lpvtblIPersistStream = &OLEPictureImpl_IPersistStream_VTable;
newObject->lpvtblIConnectionPointContainer = &OLEPictureImpl_IConnectionPointContainer_VTable; newObject->lpvtblIConnectionPointContainer = &OLEPictureImpl_IConnectionPointContainer_VTable;
newObject->pCP = NULL;
CreateConnectionPoint((IUnknown*)newObject,&IID_IPropertyNotifySink,&newObject->pCP); CreateConnectionPoint((IUnknown*)newObject,&IID_IPropertyNotifySink,&newObject->pCP);
if (!newObject->pCP)
{
HeapFree(GetProcessHeap(), 0, newObject);
return NULL;
}
/* /*
* Start with one reference count. The caller of this function * Start with one reference count. The caller of this function
...@@ -349,6 +355,9 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj) ...@@ -349,6 +355,9 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj)
{ {
TRACE("(%p)\n", Obj); TRACE("(%p)\n", Obj);
if (Obj->pCP)
IConnectionPoint_Release(Obj->pCP);
if(Obj->fOwn) { /* We need to destroy the picture */ if(Obj->fOwn) { /* We need to destroy the picture */
switch(Obj->desc.picType) { switch(Obj->desc.picType) {
case PICTYPE_BITMAP: case PICTYPE_BITMAP:
......
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