ole32: DefaultHandler_GetData and DefaultHandler_QueryGetData should

both defer to the real data object if the cached versions fail and we are running.

ole32: DefaultHandler_GetData and DefaultHandler_QueryGetData should
53d01d27 · Robert Shearman · Alexandre Julliard · 6bf6caa6 · 53d01d27
Commit 53d01d27 authored Aug 31, 2006 by Robert Shearman Committed by Alexandre Julliard Sep 07, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

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

No files found.
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -972,6 +972,9 @@ static HRESULT WINAPI DefaultHandler_GetData(

  IDataObject_Release(cacheDataObject);

+  if (FAILED(hres) && This->pDataDelegate)
+    hres = IDataObject_GetData(This->pDataDelegate, pformatetcIn, pmedium);
+
  return hres;
 }

@@ -1015,6 +1018,9 @@ static HRESULT WINAPI DefaultHandler_QueryGetData(

  IDataObject_Release(cacheDataObject);

+  if (FAILED(hres) && This->pDataDelegate)
+    hres = IDataObject_QueryGetData(This->pDataDelegate, pformatetc);
+
  return hres;
 }