Jacek Caban : shdocvw: Set active document of both frame and doc window.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 26f6a30f583cfae083a0856e18ee466093a7d67f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=26f6a30f583cfae083a0856e...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Sat Apr  8 20:51:37 2006 +0200

shdocvw: Set active document of both frame and doc window.

---

 dlls/shdocvw/oleobject.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index fa3e9dc..32d7452 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -298,7 +298,10 @@ static HRESULT WINAPI OleObject_DoVerb(I
         IOleInPlaceSite_OnUIActivate(inplace);
         IOleInPlaceSite_Release(inplace);
 
-        IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem);
+        if(This->frame)
+            IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem);
+        if(This->uiwindow)
+            IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, ACTIVEOBJ(This), wszitem);
 
         /* TODO:
          * IOleInPlaceFrmae_SetMenu