Jacek Caban : mshtml: Use call_set_active_object in exec_editmode.
Alexandre Julliard
julliard at winehq.org
Tue Nov 20 10:54:56 CST 2007
Module: wine
Branch: master
Commit: ebc89a02d37dd0447bc2d4425b76ffd0fca9f886
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc89a02d37dd0447bc2d4425b76ffd0fca9f886
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Nov 20 01:49:50 2007 +0100
mshtml: Use call_set_active_object in exec_editmode.
---
dlls/mshtml/olecmd.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index b76ea31..db2d629 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -595,11 +595,10 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
return hres;
if(This->ui_active) {
- OLECHAR wszHTMLDocument[30];
RECT rcBorderWidths;
if(This->ip_window)
- IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL);
+ call_set_active_object(This->ip_window, NULL);
if(This->hostui)
IDocHostUIHandler_HideUI(This->hostui);
@@ -607,11 +606,8 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This),
This->frame, This->ip_window);
- LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument,
- sizeof(wszHTMLDocument)/sizeof(WCHAR));
-
if(This->ip_window)
- IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument);
+ call_set_active_object(This->ip_window, ACTOBJ(This));
memset(&rcBorderWidths, 0, sizeof(rcBorderWidths));
IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths);
More information about the wine-cvs
mailing list