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@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ole32: Release interfaces as part of Stop.
5ae2b5ae · Huw Davies · Alexandre Julliard · 719c479a · 5ae2b5ae
Commit 5ae2b5ae authored Oct 14, 2015 by Huw Davies Committed by Alexandre Julliard Oct 15, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

defaulthandler.c dlls/ole32/defaulthandler.c +1 -3

No files found.
--- 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;