Robert Shearman : ole32: DefaultHandler_GetData and DefaultHandler_QueryGetData should

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 53d01d2764d35a654038749770274d2d491cd23f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=53d01d2764d35a6540387497...

Author: Robert Shearman <rob(a)codeweavers.com>
Date:   Thu Aug 31 17:20:02 2006 +0100

ole32: DefaultHandler_GetData and DefaultHandler_QueryGetData should
both defer to the real data object if the cached versions fail and we
are running.

---

 dlls/ole32/defaulthandler.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index 4158f50..a1af68e 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -972,6 +972,9 @@ static HRESULT WINAPI DefaultHandler_Get
 
   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_Que
 
   IDataObject_Release(cacheDataObject);
 
+  if (FAILED(hres) && This->pDataDelegate)
+    hres = IDataObject_QueryGetData(This->pDataDelegate, pformatetc);
+
   return hres;
 }