June 2007 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Call update_doc in exec_editmode.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 86e224c12d09183551af29e0727322d2f6d7eec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e224c12d09183551af29e07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:40:16 2007 +0200 mshtml: Call update_doc in exec_editmode. --- dlls/mshtml/olecmd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 2c30dc7..8a0aa61 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -553,6 +553,8 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return hres; } + update_doc(This, UPDATE_UI); + return IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); }

1 0

Jacek Caban : mshtml: Pump messages of all windows in test_download.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: ef93de1671de09636c1e46551d6e4a040d01e1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef93de1671de09636c1e46551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:41:25 2007 +0200 mshtml: Pump messages of all windows in test_download. We have to pump Gecko windows' messages to correctly support loading documents. --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 9033c55..792074d 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2291,7 +2291,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl) SET_EXPECT(Exec_HTTPEQUIV_DONE); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ - while(!called_Exec_HTTPEQUIV_DONE && GetMessage(&msg, hwnd, 0, 0)) { + while(!called_Exec_HTTPEQUIV_DONE && GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); }

1 0

Jacek Caban : mshtml: Improve IDM_JUSTIFYLEFT query status.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 5c08a14cdd7a8d7549f4acb1c163214ec81d6b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c08a14cdd7a8d7549f4acb1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:42:00 2007 +0200 mshtml: Improve IDM_JUSTIFYLEFT query status. --- dlls/mshtml/editor.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 9b68c32..03cc546 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -738,7 +738,11 @@ static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd) break; case IDM_JUSTIFYLEFT: TRACE("(%p) IDM_JUSTIFYLEFT\n", This); - cmd->cmdf = query_align_status(This, NSALIGN_LEFT); + /* FIXME: We should set OLECMDF_LATCHED only if it's set explicitly. */ + if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + cmd->cmdf = OLECMDF_SUPPORTED; + else + cmd->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; break; case IDM_JUSTIFYRIGHT: TRACE("(%p) IDM_JUSTIFYRIGHT\n", This);

1 0

Jacek Caban : mshtml: Call UpdateUI and Exec(OLECMDID_UPDATECOMMANDS) from timer callback.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: d8e518eb68632d694670b6adc2b5285dc0c46958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e518eb68632d694670b6adc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:38:51 2007 +0200 mshtml: Call UpdateUI and Exec(OLECMDID_UPDATECOMMANDS) from timer callback. --- dlls/mshtml/mshtml_private.h | 7 +++++ dlls/mshtml/view.c | 51 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7842e85..7dd54bd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -115,6 +115,8 @@ struct HTMLDocument { BOOL has_key_path; BOOL container_locked; + DWORD update; + ConnectionPoint *cp_htmldocevents; ConnectionPoint *cp_htmldocevents2; ConnectionPoint *cp_propnotif; @@ -382,6 +384,11 @@ typedef struct { extern const cmdtable_t editmode_cmds[]; +#define UPDATE_UI 0x0001 +#define UPDATE_TITLE 0x0002 + +void update_doc(HTMLDocument *This, DWORD flags); + /* editor */ void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 79fe399..238ed09 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define TIMER_ID 0x1000 + static const WCHAR wszInternetExplorer_Server[] = {'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','_','S','e','r','v','e','r',0}; @@ -94,6 +96,45 @@ static void activate_gecko(HTMLDocument *This) nsIWebBrowserFocus_Activate(This->nscontainer->focus); } +void update_doc(HTMLDocument *This, DWORD flags) +{ + if(!This->update && This->hwnd) + SetTimer(This->hwnd, TIMER_ID, 100, NULL); + + This->update |= flags; +} + +static LRESULT on_timer(HTMLDocument *This) +{ + TRACE("(%p) %x\n", This, This->update); + + KillTimer(This->hwnd, TIMER_ID); + + if(!This->update) + return 0; + + if(This->update & UPDATE_UI) { + if(This->hostui) + IDocHostUIHandler_UpdateUI(This->hostui); + + if(This->client) { + IOleCommandTarget *cmdtrg; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, + (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_UPDATECOMMANDS, + OLECMDEXECOPT_DONTPROMPTUSER, NULL, NULL); + IOleCommandTarget_Release(cmdtrg); + } + } + } + + This->update = 0; + return 0; +} + static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { HTMLDocument *This; @@ -130,6 +171,9 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM LOWORD(lParam) - 2*ew, HIWORD(lParam) - 2*eh, SWP_NOZORDER | SWP_NOACTIVATE); } + break; + case WM_TIMER: + return on_timer(This); } return DefWindowProcW(hwnd, msg, wParam, lParam); @@ -211,8 +255,8 @@ static HRESULT activate_window(HTMLDocument *This) /* NOTE: * Windows implementation calls: * RegisterWindowMessage("MSWHEEL_ROLLMSG"); - * SetTimer(This->hwnd, TIMER_ID, 100, NULL); */ + SetTimer(This->hwnd, TIMER_ID, 100, NULL); } This->in_place_active = TRUE; @@ -442,6 +486,7 @@ static HRESULT WINAPI OleDocumentView_Show(IOleDocumentView *iface, BOOL fShow) if(FAILED(hres)) return hres; } + update_doc(This, UPDATE_UI); ShowWindow(This->hwnd, SW_SHOW); }else { ShowWindow(This->hwnd, SW_HIDE); @@ -472,6 +517,8 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f return hres; } + update_doc(This, UPDATE_UI); + hres = IOleInPlaceSite_OnUIActivate(This->ipsite); if(SUCCEEDED(hres)) { OLECHAR wszHTMLDocument[30]; @@ -682,4 +729,6 @@ void HTMLDocument_View_Init(HTMLDocument *This) This->in_place_active = FALSE; This->ui_active = FALSE; This->window_active = FALSE; + + This->update = 0; }

1 0

Jacek Caban : mshtml: Use IOleCommandTarget::Exec to implement context menu .
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 03342918285d02ba87bb006f078b3d9d7fe151a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03342918285d02ba87bb006f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:38:16 2007 +0200 mshtml: Use IOleCommandTarget::Exec to implement context menu. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/olecmd.c | 21 +++++++++++++++++++++ dlls/mshtml/olewnd.c | 19 ------------------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3f54104..7842e85 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -313,7 +313,7 @@ NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*); void NSContainer_Release(NSContainer*); void HTMLDocument_LockContainer(HTMLDocument*,BOOL); -void HTMLDocument_ShowContextMenu(HTMLDocument*,DWORD,POINT*); +void show_context_menu(HTMLDocument*,DWORD,POINT*); void show_tooltip(HTMLDocument*,DWORD,DWORD,LPCWSTR); void hide_tooltip(HTMLDocument*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c2c7318..a5dd2d5 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -898,7 +898,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList FIXME("aContextFlags=%08x\n", aContextFlags); }; - HTMLDocument_ShowContextMenu(This->doc, dwID, &pt); + show_context_menu(This->doc, dwID, &pt); return NS_OK; } diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8c4b8cf..2c30dc7 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -814,6 +814,27 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = { OleCommandTarget_Exec }; +void show_context_menu(HTMLDocument *This, DWORD dwID, POINT *ppt) +{ + HMENU menu_res, menu; + DWORD cmdid; + HRESULT hres; + + hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, + (IUnknown*)CMDTARGET(This), (IDispatch*)HTMLDOC(This)); + if(hres == S_OK) + return; + + menu_res = LoadMenuW(get_shdoclc(), MAKEINTRESOURCEW(IDR_BROWSE_CONTEXT_MENU)); + menu = GetSubMenu(menu_res, dwID); + + cmdid = TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, + ppt->x, ppt->y, 0, This->hwnd, NULL); + DestroyMenu(menu_res); + + IOleCommandTarget_Exec(CMDTARGET(This), &CGID_MSHTML, cmdid, 0, NULL, NULL); +} + void HTMLDocument_OleCmd_Init(HTMLDocument *This) { This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index 45e505a..d91e792 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -262,25 +262,6 @@ static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { #undef INPLACEWIN_THIS -void HTMLDocument_ShowContextMenu(HTMLDocument *This, DWORD dwID, POINT *ppt) -{ - HMENU menu_res, menu; - HRESULT hres; - - hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, - (IUnknown*)CMDTARGET(This), (IDispatch*)HTMLDOC(This)); - if(hres == S_OK) - return; - - menu_res = LoadMenuW(get_shdoclc(), MAKEINTRESOURCEW(IDR_BROWSE_CONTEXT_MENU)); - menu = GetSubMenu(menu_res, dwID); - - TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, - ppt->x, ppt->y, 0, This->hwnd, NULL); - - DestroyMenu(menu_res); -} - void HTMLDocument_Window_Init(HTMLDocument *This) { This->lpOleInPlaceActiveObjectVtbl = &OleInPlaceActiveObjectVtbl;

1 0

Jacek Caban : mshtml: Don' t do anything in exec_editmode if edit mode is already set.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 239b86fe8ff16c6be952421823beea36a4f55452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239b86fe8ff16c6be95242182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:37:37 2007 +0200 mshtml: Don't do anything in exec_editmode if edit mode is already set. --- dlls/mshtml/olecmd.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 468c401..8c4b8cf 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -523,6 +523,9 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(in || out) FIXME("unsupported args\n"); + if(This->usermode == EDITMODE) + return S_OK; + This->usermode = EDITMODE; if(This->frame) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2627a85..083181a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2571,6 +2571,10 @@ static void test_exec_editmode(IUnknown *unk) IOleCommandTarget_Release(cmdtrg); editmode = TRUE; + + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_EDITMODE, + OLECMDEXECOPT_DODEFAULT, NULL, NULL); + ok(hres == S_OK, "Exec failed: %08x\n", hres); } static HWND create_container_window(void)

1 0

Jacek Caban : mshtml: Don't crash in load_stream if Gecko is not available.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 95e96fd54784cf025a9355878569a3ff1c2224d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95e96fd54784cf025a9355878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:36:54 2007 +0200 mshtml: Don't crash in load_stream if Gecko is not available. --- dlls/mshtml/navigate.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bcafb6c..dd7d78d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -826,8 +826,10 @@ HRESULT load_stream(BSCallback *bscallback, IStream *stream) add_nsrequest(bscallback); - bscallback->nschannel->content = mshtml_alloc(sizeof(text_html)); - memcpy(bscallback->nschannel->content, text_html, sizeof(text_html)); + if(bscallback->nschannel) { + bscallback->nschannel->content = mshtml_alloc(sizeof(text_html)); + memcpy(bscallback->nschannel->content, text_html, sizeof(text_html)); + } hres = read_stream_data(bscallback, stream); IBindStatusCallback_OnStopBinding(STATUSCLB(bscallback), hres, ERROR_SUCCESS);

1 0

Jacek Caban : mshtml: Forward all IsDirty implementations to one function.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: bf7a479042a13fa8528c194245751c53a17a5d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7a479042a13fa8528c19424… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:35:55 2007 +0200 mshtml: Forward all IsDirty implementations to one function. --- dlls/mshtml/persist.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2cc80ec..8045241 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -332,8 +332,10 @@ static HRESULT WINAPI PersistMoniker_GetClassID(IPersistMoniker *iface, CLSID *p static HRESULT WINAPI PersistMoniker_IsDirty(IPersistMoniker *iface) { HTMLDocument *This = PERSISTMON_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return IPersistStreamInit_IsDirty(PERSTRINIT(This)); } static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAvailable, @@ -467,8 +469,10 @@ static HRESULT WINAPI PersistFile_GetClassID(IPersistFile *iface, CLSID *pClassI static HRESULT WINAPI PersistFile_IsDirty(IPersistFile *iface) { HTMLDocument *This = PERSISTFILE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return IPersistStreamInit_IsDirty(PERSTRINIT(This)); } static HRESULT WINAPI PersistFile_Load(IPersistFile *iface, LPCOLESTR pszFileName, DWORD dwMode)

1 0

Jacek Caban : mshtml: Move setup_ns_editing to nsembed.c.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 791b868ce7883c254cee007cc759f45efd2ca9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=791b868ce7883c254cee007cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:35:11 2007 +0200 mshtml: Move setup_ns_editing to nsembed.c. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 48 ++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/olecmd.c | 50 +----------------------------------------- 3 files changed, 50 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5a0b17b..3f54104 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -383,6 +383,7 @@ typedef struct { extern const cmdtable_t editmode_cmds[]; /* editor */ +void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2040e03..c2c7318 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -580,6 +580,54 @@ void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str) nsIContentSerializer_Release(serializer); } +void set_ns_editmode(NSContainer *This) +{ + nsIInterfaceRequestor *iface_req; + nsIEditingSession *editing_session = NULL; + nsIURIContentListener *listener = NULL; + nsIDOMWindow *dom_window = NULL; + nsresult nsres; + + nsres = nsIWebBrowser_QueryInterface(This->webbrowser, + &IID_nsIInterfaceRequestor, (void**)&iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); + return; + } + + nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession, + (void**)&editing_session); + nsIInterfaceRequestor_Release(iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIEditingSession: %08x\n", nsres); + return; + } + + nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); + if(NS_FAILED(nsres)) { + ERR("Could not get content DOM window: %08x\n", nsres); + nsIEditingSession_Release(editing_session); + return; + } + + nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, NULL, FALSE); + nsIEditingSession_Release(editing_session); + nsIDOMWindow_Release(dom_window); + if(NS_FAILED(nsres)) { + ERR("MakeWindowEditable failed: %08x\n", nsres); + return; + } + + /* MakeWindowEditable changes WebBrowser's parent URI content listener. + * It seams to be a bug in Gecko. To workaround it we set our content + * listener again and Gecko's one as its parent. + */ + nsIWebBrowser_GetParentURIContentListener(This->webbrowser, &listener); + nsIURIContentListener_SetParentContentListener(NSURICL(This), listener); + nsIURIContentListener_Release(listener); + nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); +} + void close_gecko(void) { TRACE("()\n"); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 2c5a8ba..468c401 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -511,54 +511,6 @@ static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in return S_OK; } -static void setup_ns_editing(NSContainer *This) -{ - nsIInterfaceRequestor *iface_req; - nsIEditingSession *editing_session = NULL; - nsIURIContentListener *listener = NULL; - nsIDOMWindow *dom_window = NULL; - nsresult nsres; - - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession, - (void**)&editing_session); - nsIInterfaceRequestor_Release(iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIEditingSession: %08x\n", nsres); - return; - } - - nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); - if(NS_FAILED(nsres)) { - ERR("Could not get content DOM window: %08x\n", nsres); - nsIEditingSession_Release(editing_session); - return; - } - - nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, NULL, FALSE); - nsIEditingSession_Release(editing_session); - nsIDOMWindow_Release(dom_window); - if(NS_FAILED(nsres)) { - ERR("MakeWindowEditable failed: %08x\n", nsres); - return; - } - - /* MakeWindowEditable changes WebBrowser's parent URI content listener. - * It seams to be a bug in Gecko. To workaround it we set our content - * listener again and Gecko's one as its parent. - */ - nsIWebBrowser_GetParentURIContentListener(This->webbrowser, &listener); - nsIURIContentListener_SetParentContentListener(NSURICL(This), listener); - nsIURIContentListener_Release(listener); - nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); -} - static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { IMoniker *mon; @@ -590,7 +542,7 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, } if(This->nscontainer) - setup_ns_editing(This->nscontainer); + set_ns_editmode(This->nscontainer); hres = CreateURLMoniker(NULL, wszAboutBlank, &mon); if(FAILED(hres)) {

1 0

Jacek Caban : mshtml: Move remaining status queries to command tables.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 78509882e7076f13720aa984cecb09bf7b605b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78509882e7076f13720aa984c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:34:00 2007 +0200 mshtml: Move remaining status queries to command tables. --- dlls/mshtml/olecmd.c | 54 ++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index b846588..2c5a8ba 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -619,6 +619,26 @@ static HRESULT exec_baselinefont3(HTMLDocument *This, DWORD cmdexecopt, VARIANT return S_OK; } +static HRESULT query_enabled_stub(HTMLDocument *This, OLECMD *cmd) +{ + switch(cmd->cmdID) { + case IDM_PRINT: + FIXME("CGID_MSHTML: IDM_PRINT\n"); + cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_BLOCKDIRLTR: + FIXME("CGID_MSHTML: IDM_BLOCKDIRLTR\n"); + cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_BLOCKDIRRTL: + FIXME("CGID_MSHTML: IDM_BLOCKDIRRTL\n"); + cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + } + + return S_OK; +} + static const struct { OLECMDF cmdf; HRESULT (*func)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); @@ -668,12 +688,14 @@ static const cmdtable_t base_cmds[] = { {IDM_COPY, query_mshtml_copy, exec_mshtml_copy}, {IDM_PASTE, query_mshtml_paste, exec_mshtml_paste}, {IDM_CUT, query_mshtml_cut, exec_mshtml_cut}, - {IDM_BROWSEMODE, NULL, exec_browsemode}, - {IDM_EDITMODE, NULL, exec_editmode}, - {IDM_PRINT, NULL, exec_print}, - {IDM_SETDIRTY, NULL, exec_setdirty}, - {IDM_HTMLEDITMODE, NULL, exec_htmleditmode}, - {IDM_BASELINEFONT3, NULL, exec_baselinefont3}, + {IDM_BROWSEMODE, NULL, exec_browsemode}, + {IDM_EDITMODE, NULL, exec_editmode}, + {IDM_PRINT, query_enabled_stub, exec_print}, + {IDM_SETDIRTY, NULL, exec_setdirty}, + {IDM_HTMLEDITMODE, NULL, exec_htmleditmode}, + {IDM_BASELINEFONT3, NULL, exec_baselinefont3}, + {IDM_BLOCKDIRLTR, query_enabled_stub, NULL}, + {IDM_BLOCKDIRRTL, query_enabled_stub, NULL}, {0,NULL,NULL} }; @@ -763,26 +785,8 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con HRESULT hres = query_from_table(This, base_cmds, prgCmds+i); if(hres == OLECMDERR_E_NOTSUPPORTED) hres = query_from_table(This, editmode_cmds, prgCmds+i); - if(hres != OLECMDERR_E_NOTSUPPORTED) - continue; - - switch(prgCmds[i].cmdID) { - case IDM_PRINT: - FIXME("CGID_MSHTML: IDM_PRINT\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; - break; - case IDM_BLOCKDIRLTR: - FIXME("CGID_MSHTML: IDM_BLOCKDIRLTR\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; - break; - case IDM_BLOCKDIRRTL: - FIXME("CGID_MSHTML: IDM_BLOCKDIRRTL\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; - break; - default: + if(hres == OLECMDERR_E_NOTSUPPORTED) FIXME("CGID_MSHTML: unsupported cmdID %d\n", prgCmds[i].cmdID); - prgCmds[i].cmdf = 0; - } } hres = prgCmds[i-1].cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED;

1 0