ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Always use object_is_running to check whether the object is running. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2015-10-14 10:33:48 +01:00 committed by Alexandre Julliard
parent a56a0eb063
commit 4fcc5fec57
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ole32/defaulthandler.c
View File

@ -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);