ole32: Add a check for NULL This->dataAdviseHolder in DefaultHandler_Stop.

Cleanup DefaultHandler_GetCanonicalFormatEtc by using This->pDataDelegate instead of querying for IDataObject from This->pOleDelegate.

ole32: Add a check for NULL This->dataAdviseHolder in DefaultHandler_Stop.
c350e000 · Robert Shearman · Alexandre Julliard · 8d7bfca9 · c350e000
Commit c350e000 authored Aug 09, 2006 by Robert Shearman Committed by Alexandre Julliard Aug 09, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

defaulthandler.c dlls/ole32/defaulthandler.c +4 -6

No files found.
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -416,7 +416,8 @@ static void WINAPI DefaultHandler_Stop(DefaultHandler *This)
  /* FIXME: call IOleCache_OnStop */
-  DataAdviseHolder_OnDisconnect(This->dataAdviseHolder);
+  if (This->dataAdviseHolder)
+    DataAdviseHolder_OnDisconnect(This->dataAdviseHolder);
  if (This->pDataDelegate)
  {
     IDataObject_Release(This->pDataDelegate);
@@ -1030,16 +1031,13 @@ static HRESULT WINAPI DefaultHandler_GetCanonicalFormatEtc(
 	    LPFORMATETC      pformatetcOut)
 {
  DefaultHandler *This = impl_from_IDataObject(iface);
-  IDataObject *pDataObject;
-  HRESULT hr;
  TRACE("(%p, %p, %p)\n", iface, pformatetcIn, pformatetcOut);
-  if (!This->pOleDelegate)
+  if (!This->pDataDelegate)
    return OLE_E_NOTRUNNING;
-  hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, (void **)&pDataObject);
+  return IDataObject_GetCanonicalFormatEtc(This->pDataDelegate, pformatetcIn, pformatetcOut);
-  return IDataObject_GetCanonicalFormatEtc(pDataObject, pformatetcIn, pformatetcOut);
 }
 /************************************************************************