Huw Davies : ole32: Always use object_is_running to check whether the object is running.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Oct 14 11:12:50 CDT 2015
Module: wine
Branch: master
Commit: 4fcc5fec57349bf4ad82448b14d47280769fd5ff
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fcc5fec57349bf4ad82448b14d47280769fd5ff
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Oct 14 10:33:48 2015 +0100
ole32: Always use object_is_running to check whether the object is running.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ole32/defaulthandler.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index 1903932..ad79e99 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -1021,7 +1021,7 @@ static HRESULT WINAPI DefaultHandler_GetData(
IDataObject_Release(cacheDataObject);
- if (FAILED(hres) && This->pDataDelegate)
+ if (FAILED(hres) && object_is_running( This ))
hres = IDataObject_GetData(This->pDataDelegate, pformatetcIn, pmedium);
return hres;
@@ -1067,7 +1067,7 @@ static HRESULT WINAPI DefaultHandler_QueryGetData(
IDataObject_Release(cacheDataObject);
- if (FAILED(hres) && This->pDataDelegate)
+ if (FAILED(hres) && object_is_running( This ))
hres = IDataObject_QueryGetData(This->pDataDelegate, pformatetc);
return hres;
@@ -1089,7 +1089,7 @@ static HRESULT WINAPI DefaultHandler_GetCanonicalFormatEtc(
TRACE("(%p, %p, %p)\n", iface, pformatetcIn, pformatetcOut);
- if (!This->pDataDelegate)
+ if (!object_is_running( This ))
return OLE_E_NOTRUNNING;
return IDataObject_GetCanonicalFormatEtc(This->pDataDelegate, pformatetcIn, pformatetcOut);
@@ -1177,7 +1177,7 @@ static HRESULT WINAPI DefaultHandler_DAdvise(
if (!This->dataAdviseHolder)
{
hres = CreateDataAdviseHolder(&This->dataAdviseHolder);
- if (SUCCEEDED(hres) && This->pDataDelegate)
+ if (SUCCEEDED(hres) && object_is_running( This ))
DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate);
}
@@ -1327,8 +1327,6 @@ static HRESULT WINAPI DefaultHandler_Run(
if (FAILED(hr))
return hr;
- This->object_state = object_state_running;
-
hr = IOleObject_Advise(This->pOleDelegate, &This->IAdviseSink_iface, &This->dwAdvConn);
if (FAILED(hr)) goto fail;
@@ -1365,6 +1363,8 @@ static HRESULT WINAPI DefaultHandler_Run(
(void **)&This->pDataDelegate);
if (FAILED(hr)) goto fail;
+ This->object_state = object_state_running;
+
if (This->dataAdviseHolder)
{
hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate);
More information about the wine-cvs
mailing list