Rob Shearman : mshtml: Pass the correct DOCHOSTUITYPE value to IDocHostUIHandler_ShowUI.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jul 25 07:44:12 CDT 2007


Module: wine
Branch: master
Commit: 9a67e1ffe536c7c65f4a028ac03ae4c22bcb8593
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9a67e1ffe536c7c65f4a028ac03ae4c22bcb8593

Author: Rob Shearman <rob at codeweavers.com>
Date:   Tue Jul 24 17:06:47 2007 -0500

mshtml: Pass the correct DOCHOSTUITYPE value to IDocHostUIHandler_ShowUI.

Don't reset window_active in OleDocumentView_UIActivate.

---

 dlls/mshtml/view.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c
index c79da80..a201de0 100644
--- a/dlls/mshtml/view.c
+++ b/dlls/mshtml/view.c
@@ -596,8 +596,9 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f
             return hres;
         }
 
-        hres = IDocHostUIHandler_ShowUI(This->hostui, 0, ACTOBJ(This), CMDTARGET(This),
-                This->frame, This->ip_window);
+        hres = IDocHostUIHandler_ShowUI(This->hostui,
+                This->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE,
+                ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window);
         if(FAILED(hres))
             IDocHostUIHandler_HideUI(This->hostui);
 
@@ -609,7 +610,6 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f
 
         This->ui_active = TRUE;
     }else {
-        This->window_active = FALSE;
         if(This->ui_active) {
             This->ui_active = FALSE;
             if(This->ip_window)




More information about the wine-cvs mailing list