wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Huw Davies : ole32: Release interfaces as part of Stop.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 5ae2b5ae93ac196b07e731c16be46877b00c9eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae2b5ae93ac196b07e731c16… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:52 2015 +0100 ole32: Release interfaces as part of Stop. This can now be done as Stop will no longer be called from within an object call. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index e3f13a6..3200f4b 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -502,6 +502,7 @@ static void DefaultHandler_Stop(DefaultHandler *This) DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); This->object_state = object_state_not_running; + release_delegates( This ); } /************************************************************************ @@ -529,7 +530,6 @@ static HRESULT WINAPI DefaultHandler_Close( end_object_call( This ); DefaultHandler_Stop(This); - release_delegates(This); return hr; } @@ -1517,7 +1517,6 @@ static HRESULT WINAPI DefaultHandler_Run( fail: DefaultHandler_Stop(This); - release_delegates(This); return hr; } @@ -2180,7 +2179,6 @@ static void DefaultHandler_Destroy( /* release delegates */ DefaultHandler_Stop(This); - release_delegates(This); HeapFree( GetProcessHeap(), 0, This->containerApp ); This->containerApp = NULL;

1 0

Huw Davies : ole32: Defer calling Stop in an OnClose notification during an object call.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 719c479a362d26b920ab32d6a1524031f1550283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719c479a362d26b920ab32d6a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:51 2015 +0100 ole32: Defer calling Stop in an OnClose notification during an object call. The OnClose notification may arrive during a call to the object. Releasing the object's interfaces at this point would be bad, so delay this until after the object call returns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 202 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 173 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=719c479a362d26b920ab3…

1 0

Huw Davies : ole32: Call the cache's OnRun and OnStop methods.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 79598c48034066f4cbd80a7b7e563e6206645b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79598c48034066f4cbd80a7b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:50 2015 +0100 ole32: Call the cache's OnRun and OnStop methods. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 9f6fa2b..dd5a37a 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -459,12 +459,20 @@ static void release_delegates(DefaultHandler *This) /* undoes the work done by DefaultHandler_Run */ static void DefaultHandler_Stop(DefaultHandler *This) { + IOleCacheControl *cache_ctrl; + HRESULT hr; + if (!object_is_running(This)) return; - IOleObject_Unadvise(This->pOleDelegate, This->dwAdvConn); + hr = IUnknown_QueryInterface( This->dataCache, &IID_IOleCacheControl, (void **)&cache_ctrl ); + if (SUCCEEDED(hr)) + { + hr = IOleCacheControl_OnStop( cache_ctrl ); + IOleCacheControl_Release( cache_ctrl ); + } - /* FIXME: call IOleCache_OnStop */ + IOleObject_Unadvise(This->pOleDelegate, This->dwAdvConn); if (This->dataAdviseHolder) DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); @@ -1331,6 +1339,7 @@ static HRESULT WINAPI DefaultHandler_Run( { DefaultHandler *This = impl_from_IRunnableObject(iface); HRESULT hr; + IOleCacheControl *cache_ctrl; FIXME("(%p): semi-stub\n", pbc); @@ -1374,7 +1383,6 @@ static HRESULT WINAPI DefaultHandler_Run( /* FIXME: do more stuff here: * - IOleObject_GetMiscStatus * - IOleObject_GetMoniker - * - IOleCache_OnRun */ hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, @@ -1389,6 +1397,12 @@ static HRESULT WINAPI DefaultHandler_Run( if (FAILED(hr)) goto fail; } + hr = IUnknown_QueryInterface( This->dataCache, &IID_IOleCacheControl, (void **)&cache_ctrl ); + if (FAILED(hr)) goto fail; + hr = IOleCacheControl_OnRun( cache_ctrl, This->pDataDelegate ); + IOleCacheControl_Release( cache_ctrl ); + if (FAILED(hr)) goto fail; + return hr; fail:

1 0

Huw Davies : ole32: Return OLE_E_NOTRUNNING on a cache-miss when the object isn't running.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: e4ec89f2b052fa8052ba394d013e46d1660587ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ec89f2b052fa8052ba394d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:49 2015 +0100 ole32: Return OLE_E_NOTRUNNING on a cache-miss when the object isn't running. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 22 ++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 2 -- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index ad79e99..9f6fa2b 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1021,8 +1021,17 @@ static HRESULT WINAPI DefaultHandler_GetData( IDataObject_Release(cacheDataObject); - if (FAILED(hres) && object_is_running( This )) + if (hres == S_OK) return hres; + + if (object_is_running( This )) + { hres = IDataObject_GetData(This->pDataDelegate, pformatetcIn, pmedium); + if (hres == S_OK) return hres; + } + + /* Query running state again, as the object may have closed during _GetData call */ + if (!object_is_running( This )) + hres = OLE_E_NOTRUNNING; return hres; } @@ -1067,8 +1076,17 @@ static HRESULT WINAPI DefaultHandler_QueryGetData( IDataObject_Release(cacheDataObject); - if (FAILED(hres) && object_is_running( This )) + if (hres == S_OK) return hres; + + if (object_is_running( This )) + { hres = IDataObject_QueryGetData(This->pDataDelegate, pformatetc); + if (hres == S_OK) return hres; + } + + /* Query running state again, as the object may have closed during _QueryGetData call */ + if (!object_is_running( This )) + hres = OLE_E_NOTRUNNING; return hres; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index b297f03..39680af 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1933,7 +1933,6 @@ static void test_default_handler(void) fmtetc.lindex = -1; fmtetc.tymed = TYMED_ENHMF; hr = IDataObject_QueryGetData(pDataObject, &fmtetc); - todo_wine ok(hr == OLE_E_NOTRUNNING, "IDataObject_QueryGetData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); fmtetc.cfFormat = CF_TEXT; @@ -1942,7 +1941,6 @@ static void test_default_handler(void) fmtetc.lindex = -1; fmtetc.tymed = TYMED_NULL; hr = IDataObject_QueryGetData(pDataObject, &fmtetc); - todo_wine ok(hr == OLE_E_NOTRUNNING, "IDataObject_QueryGetData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); hr = IOleObject_QueryInterface(pObject, &IID_IRunnableObject, (void **)&pRunnableObject);

1 0

Huw Davies : ole32: Always use object_is_running to check whether the object is running.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 4fcc5fec57349bf4ad82448b14d47280769fd5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fcc5fec57349bf4ad82448b1… Author: Huw Davies <huw(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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);

1 0

Huw Davies : ole32: Rewrite _Run() to return early on failure.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: a56a0eb063cca82dbbdcc8c3b30f753400c96035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56a0eb063cca82dbbdcc8c3b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:47 2015 +0100 ole32: Rewrite _Run() to return early on failure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 52 +++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 913d4af..1903932 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1330,26 +1330,30 @@ static HRESULT WINAPI DefaultHandler_Run( This->object_state = object_state_running; hr = IOleObject_Advise(This->pOleDelegate, &This->IAdviseSink_iface, &This->dwAdvConn); + if (FAILED(hr)) goto fail; - if (SUCCEEDED(hr) && This->clientSite) - hr = IOleObject_SetClientSite(This->pOleDelegate, This->clientSite); - - if (SUCCEEDED(hr)) + if (This->clientSite) { - IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, - (void **)&This->pPSDelegate); - if (This->pPSDelegate) - { - if(This->storage_state == storage_state_initialised) - hr = IPersistStorage_InitNew(This->pPSDelegate, This->storage); - else if(This->storage_state == storage_state_loaded) - hr = IPersistStorage_Load(This->pPSDelegate, This->storage); - } + hr = IOleObject_SetClientSite(This->pOleDelegate, This->clientSite); + if (FAILED(hr)) goto fail; } - if (SUCCEEDED(hr) && This->containerApp) + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, + (void **)&This->pPSDelegate); + if (FAILED(hr)) goto fail; + + if (This->storage_state == storage_state_initialised) + hr = IPersistStorage_InitNew(This->pPSDelegate, This->storage); + else if (This->storage_state == storage_state_loaded) + hr = IPersistStorage_Load(This->pPSDelegate, This->storage); + if (FAILED(hr)) goto fail; + + if (This->containerApp) + { hr = IOleObject_SetHostNames(This->pOleDelegate, This->containerApp, This->containerObj); + if (FAILED(hr)) goto fail; + } /* FIXME: do more stuff here: * - IOleObject_GetMiscStatus @@ -1357,20 +1361,22 @@ static HRESULT WINAPI DefaultHandler_Run( * - IOleCache_OnRun */ - if (SUCCEEDED(hr)) - hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, - (void **)&This->pDataDelegate); + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, + (void **)&This->pDataDelegate); + if (FAILED(hr)) goto fail; - if (SUCCEEDED(hr) && This->dataAdviseHolder) - hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); - - if (FAILED(hr)) + if (This->dataAdviseHolder) { - DefaultHandler_Stop(This); - release_delegates(This); + hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); + if (FAILED(hr)) goto fail; } return hr; + +fail: + DefaultHandler_Stop(This); + release_delegates(This); + return hr; } /************************************************************************

1 0

Frédéric Delanoy : cmd/tests: Simplify boolean expressions (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: e6042cf6a64f12d2414b1e6be9df9687c2733b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6042cf6a64f12d2414b1e6be… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 14 01:58:39 2015 +0200 cmd/tests: Simplify boolean expressions (PVS-Studio). Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/batch.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 9df0bc5..c1847d6 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -320,13 +320,14 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da /* If we rewind to the beginning of the line, don't increment line number */ line--; } - else if (!is_exp_resync || (is_exp_resync && !err)) + else if (!is_exp_resync || !err) { exp_ptr = exp_nl+1; if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') exp_ptr++; } - if (!is_out_resync || (is_out_resync && !err)) + + if (!is_out_resync || !err) { out_ptr = out_nl+1; if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n')

1 0

Frédéric Delanoy : cmd: Simplify boolean expressions (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 23e7b5a6b0fcb787d4b322f508054a8fdbcc9cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e7b5a6b0fcb787d4b322f50… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 14 01:58:38 2015 +0200 cmd: Simplify boolean expressions (PVS-Studio). Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5661c69..e9b9ddd 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1005,7 +1005,7 @@ void WCMD_copy(WCHAR * args) { if (!srcisdevice) FindClose (hff); } else { /* Error if the first file was not found */ - if (!anyconcats || (anyconcats && !writtenoneconcat)) { + if (!anyconcats || !writtenoneconcat) { WCMD_print_error (); errorlevel = 1; } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7666329..ba7d9ca 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -879,7 +879,7 @@ static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) { if (startchar == '%' && forvaridx != -1 && forloopcontext.variable[forvaridx]) { /* Replace the 2 characters, % and for variable character */ WCMD_strsubstW(p, p + 2, forloopcontext.variable[forvaridx], -1); - } else if (!atExecute || (atExecute && startchar == '!')) { + } else if (!atExecute || startchar == '!') { p = WCMD_expand_envvar(p, startchar); /* In a FOR loop, see if this is the variable to replace */

1 0

Michael Stefaniuc : schedsvc: Simplify an if-condition (PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: b39b37c0aec1bd0f3e82e5b6af3cbb5f4a70ccfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39b37c0aec1bd0f3e82e5b6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 00:04:59 2015 +0200 schedsvc: Simplify an if-condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 3f11d16..8be8c0d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -87,8 +87,7 @@ static HRESULT create_directory(const WCHAR *path) WCHAR *slash; DWORD last_error = GetLastError(); - if (last_error == ERROR_ALREADY_EXISTS || last_error != ERROR_PATH_NOT_FOUND || - !(slash = strrchrW(new_path, '\\'))) + if (last_error != ERROR_PATH_NOT_FOUND || !(slash = strrchrW(new_path, '\\'))) { hr = HRESULT_FROM_WIN32(last_error); break;

1 0

Michael Stefaniuc : winemenubuilder: Simplify an if-condition (PVS-Studio) .
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 915bdcbdcada4c3f0b6841e79135375a14c58933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915bdcbdcada4c3f0b6841e79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 00:00:18 2015 +0200 winemenubuilder: Simplify an if-condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 76d8f3a..e6fd042 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3427,7 +3427,7 @@ static void cleanup_menus(void) if (data == NULL) break; lret = RegEnumValueW(hkey, i, value, &valueSize, NULL, NULL, (BYTE*)data, &dataSize); - if (lret == ERROR_SUCCESS || lret != ERROR_MORE_DATA) + if (lret != ERROR_MORE_DATA) break; valueSize *= 2; dataSize *= 2;

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015