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

Jacek Caban : mshtml: Added IDM_RESPECTVISIBILITY_INDESIGN command stub implementation.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 2aa419e809314ac40b7a994aff3bdbff69e2829f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa419e809314ac40b7a994af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:53:29 2007 +0200 mshtml: Added IDM_RESPECTVISIBILITY_INDESIGN command stub implementation. --- dlls/mshtml/olecmd.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8a0aa61..8f8837d 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 Jacek Caban for CodeWeavers + * Copyright 2005-2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -576,6 +576,13 @@ static HRESULT exec_baselinefont3(HTMLDocument *This, DWORD cmdexecopt, VARIANT return S_OK; } +static HRESULT exec_respectvisibility_indesign(HTMLDocument *This, DWORD cmdexecopt, + VARIANT *in, VARIANT *out) +{ + FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + return E_NOTIMPL; +} + static HRESULT query_enabled_stub(HTMLDocument *This, OLECMD *cmd) { switch(cmd->cmdID) { @@ -653,6 +660,7 @@ static const cmdtable_t base_cmds[] = { {IDM_BASELINEFONT3, NULL, exec_baselinefont3}, {IDM_BLOCKDIRLTR, query_enabled_stub, NULL}, {IDM_BLOCKDIRRTL, query_enabled_stub, NULL}, + {IDM_RESPECTVISIBILITY_INDESIGN, NULL, exec_respectvisibility_indesign}, {0,NULL,NULL} };

1 0

Jacek Caban : mshtml: Added IHTMLStyle::get_fontFamily implementation.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 1d428f48379b2efb694b5b443a26f5d4b7cf813d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d428f48379b2efb694b5b443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:55:25 2007 +0200 mshtml: Added IHTMLStyle::get_fontFamily implementation. --- dlls/mshtml/htmlstyle.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ea84ea6..3657033 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -77,6 +77,30 @@ static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) return S_OK; } +static HRESULT get_style_attr(HTMLStyle *This, LPCWSTR name, BSTR *p) +{ + nsAString str_name, str_value; + const PRUnichar *value; + nsresult nsres; + + nsAString_Init(&str_name, name); + nsAString_Init(&str_value, NULL); + + nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(This->nsstyle, &str_name, &str_value); + if(NS_FAILED(nsres)) + ERR("SetProperty failed: %08x\n", nsres); + + nsAString_GetData(&str_value, &value, NULL); + *p = SysAllocString(value); + + nsAString_Finish(&str_name); + nsAString_Finish(&str_value); + + TRACE("%s -> %s\n", debugstr_w(name), debugstr_w(*p)); + + return S_OK; +} + #define HTMLSTYLE_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle, iface) static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, void **ppv) @@ -175,8 +199,10 @@ static HRESULT WINAPI HTMLStyle_put_fontFamily(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_fontFamily(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, attrFontFamily, p); } static HRESULT WINAPI HTMLStyle_put_fontStyle(IHTMLStyle *iface, BSTR v)

1 0

Jacek Caban : mshtml: Added IDM_COMPOSESETTINGS implementation.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: b0fc3115c96b051420247cc706db0f44f06b7257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fc3115c96b051420247cc70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:20:30 2007 +0200 mshtml: Added IDM_COMPOSESETTINGS implementation. --- dlls/mshtml/editor.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 12a43e1..6edf951 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -864,14 +864,72 @@ static HRESULT exec_outdent(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, V static HRESULT exec_composesettings(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + WCHAR *ptr; + if(out || !in || V_VT(in) != VT_BSTR) { WARN("invalid arg\n"); return E_INVALIDARG; } - FIXME("%s\n", debugstr_w(V_BSTR(in))); + TRACE("(%p)->(%x %s)\n", This, cmdexecopt, debugstr_w(V_BSTR(in))); update_doc(This, UPDATE_UI); + + ptr = V_BSTR(in); + if(*ptr == '1') + exec_bold(This, cmdexecopt, NULL, NULL); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(*++ptr == '1') + exec_italic(This, cmdexecopt, NULL, NULL); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(*++ptr == '1') + exec_underline(This, cmdexecopt, NULL, NULL); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(isdigitW(*++ptr)) { + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = *ptr-'0'; + + exec_fontsize(This, cmdexecopt, &v, NULL); + } + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(*++ptr != ',') + FIXME("set font color\n"); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + if(*++ptr != ',') + FIXME("set background color\n"); + ptr = strchrW(ptr, ','); + if(!ptr) + return S_OK; + + ptr++; + if(*ptr) { + VARIANT v; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(ptr); + + exec_fontname(This, cmdexecopt, &v, NULL); + + SysFreeString(V_BSTR(&v)); + } + return S_OK; }

1 0

Jacek Caban : mshtml: Added semi stub IsDirty implementation.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: a8db34243040061eb0608b5aa192b6e097f2721c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8db34243040061eb0608b5aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:21:14 2007 +0200 mshtml: Added semi stub IsDirty implementation. --- dlls/mshtml/persist.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index cb1025b..13c07d4 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -565,8 +565,13 @@ static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CL static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) { HTMLDocument *This = PERSTRINIT_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(This->usermode == EDITMODE) + FIXME("Unimplemented in edit mode\n"); + + return S_FALSE; } static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM pStm)

1 0

Jacek Caban : mshtml: Added IsDirty tests.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 431cf8038e19c2c2270cb44dacd99f1e1cf6aab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=431cf8038e19c2c2270cb44da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:21:58 2007 +0200 mshtml: Added IsDirty tests. --- dlls/mshtml/tests/htmldoc.c | 44 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 52053ae..6196610 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2436,12 +2436,12 @@ static void test_QueryStatus(IUnknown *unk, REFIID cgid, ULONG cmdid, DWORD cmdf return; hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL); - ok(hres == S_OK, "QueryStatus failed: %08x\n", hres); + ok(hres == S_OK, "QueryStatus(%u) failed: %08x\n", cmdid, hres); IOleCommandTarget_Release(cmdtrg); ok(olecmd.cmdID == cmdid, "cmdID changed\n"); - ok(olecmd.cmdf == cmdf, "cmdf=%08x, expected %08x\n", olecmd.cmdf, cmdf); + ok(olecmd.cmdf == cmdf, "(%u) cmdf=%08x, expected %08x\n", cmdid, olecmd.cmdf, cmdf); } static void test_MSHTML_QueryStatus(IUnknown *unk, DWORD cmdf) @@ -2510,7 +2510,7 @@ static void test_OleCommandTarget_fail(IUnknown *unk) }; hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IIDIOleM=CommandTarget failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IIDIOleCommandTarget failed: %08x\n", hres); if(FAILED(hres)) return; @@ -2673,6 +2673,38 @@ static void test_exec_noargs(IUnknown *unk, DWORD cmdid) IOleCommandTarget_Release(cmdtrg); } +static void test_IsDirty(IUnknown *unk, HRESULT exhres) +{ + IPersistStreamInit *perinit; + IPersistMoniker *permon; + IPersistFile *perfile; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IPersistStreamInit, (void**)&perinit); + ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit failed: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IPersistStreamInit_IsDirty(perinit); + ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + IPersistStreamInit_Release(perinit); + } + + hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon); + ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker failed: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IPersistMoniker_IsDirty(permon); + ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + IPersistMoniker_Release(permon); + } + + hres = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&perfile); + ok(hres == S_OK, "QueryInterface(IID_IPersistFile failed: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IPersistFile_IsDirty(perfile); + ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + IPersistFile_Release(perfile); + } +} + static HWND create_container_window(void) { static const WCHAR wszHTMLDocumentTest[] = @@ -3155,6 +3187,7 @@ static void test_HTMLDocument(enum load_state_t ls) doc_unk = unk; test_QueryInterface(unk); + test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_ConnectionPointContainer(unk); test_Persist(unk); @@ -3175,6 +3208,7 @@ static void test_HTMLDocument(enum load_state_t ls) test_OleCommandTarget(unk); test_OnAmbientPropertyChange(unk); test_Window(unk, TRUE); + test_UIDeactivate(); test_OleCommandTarget(unk); test_Window(unk, TRUE); @@ -3241,11 +3275,13 @@ static void test_HTMLDocument_hlink(void) test_download(FALSE, TRUE); + test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_exec_onunload(unk); test_Window(unk, TRUE); test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE); + test_IsDirty(unk, S_FALSE); if(view) IOleDocumentView_Release(view); @@ -3276,6 +3312,7 @@ static void test_HTMLDocument_StreamLoad(void) ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); test_readyState(unk); + test_IsDirty(unk, S_FALSE); test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); @@ -3290,6 +3327,7 @@ static void test_HTMLDocument_StreamLoad(void) test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE); + test_IsDirty(unk, S_FALSE); if(view) { IOleDocumentView_Release(view);

1 0

Jacek Caban : mshtml: Reimplement editor mode right key using command controller.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: a7a2c2e63ad4b50f8afdfcc66c52b3f04727591e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a2c2e63ad4b50f8afdfcc66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:51:20 2007 +0200 mshtml: Reimplement editor mode right key using command controller. --- dlls/mshtml/editor.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index d0cb297..c47740b 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_ALIGN "cmd_align" #define NSCMD_BOLD "cmd_bold" +#define NSCMD_CHARNEXT "cmd_charNext" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" @@ -50,12 +51,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_MOVEPAGEUP "cmd_movePageUp" #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" +#define NSCMD_SELECTCHARNEXT "cmd_selectCharNext" #define NSCMD_SELECTLINENEXT "cmd_selectLineNext" #define NSCMD_SELECTLINEPREVIOUS "cmd_selectLinePrevious" #define NSCMD_SELECTPAGEDOWN "cmd_selectPageDown" -#define NSCMD_SELECTPAGEUP "cmd_selectPageUp" +#define NSCMD_SELECTPAGEUP "cmd_selectPageUp" +#define NSCMD_SELECTWORDNEXT "cmd_selectWordNext" #define NSCMD_UL "cmd_ul" #define NSCMD_UNDERLINE "cmd_underline" +#define NSCMD_WORDNEXT "cmd_wordNext" #define NSSTATE_ATTRIBUTE "state_attribute" #define NSSTATE_ALL "state_all" @@ -602,10 +606,18 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) TRACE("left\n"); collapse_next_char(This, key_event, FALSE); break; - case DOM_VK_RIGHT: + case DOM_VK_RIGHT: { + static const char *cmds[] = { + NSCMD_CHARNEXT, + NSCMD_WORDNEXT, + NSCMD_SELECTCHARNEXT, + NSCMD_SELECTWORDNEXT + }; + TRACE("right\n"); - collapse_next_char(This, key_event, TRUE); + handle_arrow_key(This, key_event, cmds); break; + } case DOM_VK_UP: { static const char *cmds[] = { NSCMD_LINEPREVIOUS, @@ -614,6 +626,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) NSCMD_SELECTPAGEUP }; + TRACE("up\n"); handle_arrow_key(This, key_event, cmds); break; } @@ -625,6 +638,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) NSCMD_SELECTPAGEDOWN }; + TRACE("down\n"); handle_arrow_key(This, key_event, cmds); break; }

1 0

Jacek Caban : mshtml: Added editor mode down key implementation.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: b542374574b5d701ce63805bb25f3513710206d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b542374574b5d701ce63805bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:50:43 2007 +0200 mshtml: Added editor mode down key implementation. --- dlls/mshtml/editor.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 4c1485d..d0cb297 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -44,11 +44,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_INDENT "cmd_indent" #define NSCMD_INSERTHR "cmd_insertHR" #define NSCMD_ITALIC "cmd_italic" +#define NSCMD_LINENEXT "cmd_lineNext" #define NSCMD_LINEPREVIOUS "cmd_linePrevious" +#define NSCMD_MOVEPAGEDOWN "cmd_movePageDown" #define NSCMD_MOVEPAGEUP "cmd_movePageUp" #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" +#define NSCMD_SELECTLINENEXT "cmd_selectLineNext" #define NSCMD_SELECTLINEPREVIOUS "cmd_selectLinePrevious" +#define NSCMD_SELECTPAGEDOWN "cmd_selectPageDown" #define NSCMD_SELECTPAGEUP "cmd_selectPageUp" #define NSCMD_UL "cmd_ul" #define NSCMD_UNDERLINE "cmd_underline" @@ -613,6 +617,17 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) handle_arrow_key(This, key_event, cmds); break; } + case DOM_VK_DOWN: { + static const char *cmds[] = { + NSCMD_LINENEXT, + NSCMD_MOVEPAGEDOWN, + NSCMD_SELECTLINENEXT, + NSCMD_SELECTPAGEDOWN + }; + + handle_arrow_key(This, key_event, cmds); + break; + } }; nsIDOMKeyEvent_Release(key_event);

1 0

Jacek Caban : mshtml: Store editor controller in NSContainer.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: b2f995a8d217861665530e36a7b1d4873176170b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f995a8d217861665530e36a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:49:12 2007 +0200 mshtml: Store editor controller in NSContainer. --- dlls/mshtml/mshtml_private.h | 4 ++ dlls/mshtml/nsembed.c | 71 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 25 +++++++++++++++ 3 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 468dd6c..44d6645 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -140,6 +140,8 @@ struct NSContainer { nsIBaseWindow *window; nsIWebBrowserFocus *focus; + nsIController *editor_controller; + LONG ref; NSContainer *parent; @@ -376,6 +378,7 @@ void release_nodes(HTMLDocument*); BOOL install_wine_gecko(void); +/* commands */ typedef struct { DWORD id; HRESULT (*query)(HTMLDocument*,OLECMD*); @@ -384,6 +387,7 @@ typedef struct { extern const cmdtable_t editmode_cmds[]; +/* timer */ #define UPDATE_UI 0x0001 #define UPDATE_TITLE 0x0002 diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 832298b..f8944e9 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_STRINGSTREAM_CONTRACTID "@mozilla.org/io/string-input-stream;1" #define NS_COMMANDPARAMS_CONTRACTID "@mozilla.org/embedcomp/command-params;1" #define NS_HTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/contentserializer;1?mimetype=text/html" +#define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" #define APPSTARTUP_TOPIC "app-startup" @@ -580,6 +581,58 @@ void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str) nsIContentSerializer_Release(serializer); } +static nsIController *get_editor_controller(NSContainer *This) +{ + nsIController *ret = NULL; + nsIEditingSession *editing_session = NULL; + nsIInterfaceRequestor *iface_req; + nsIControllerContext *ctrlctx; + nsIEditor *editor = 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 NULL; + } + + 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 NULL; + } + + nsres = nsIEditingSession_GetEditorForWindow(editing_session, + This->doc->window->nswindow, &editor); + nsIEditingSession_Release(editing_session); + if(NS_FAILED(nsres)) { + ERR("Could not get editor: %08x\n", nsres); + return NULL; + } + + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, + NS_EDITORCONTROLLER_CONTRACTID, NULL, &IID_nsIControllerContext, (void**)&ctrlctx); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIControllerContext_SetCommandContext(ctrlctx, editor); + if(NS_FAILED(nsres)) + ERR("SetCommandContext failed: %08x\n", nsres); + nsres = nsIControllerContext_QueryInterface(ctrlctx, &IID_nsIController, + (void**)&ret); + nsIControllerContext_Release(ctrlctx); + if(NS_FAILED(nsres)) + ERR("Could not get nsIController interface: %08x\n", nsres); + }else { + ERR("Could not create edit controller: %08x\n", nsres); + } + + nsISupports_Release(editor); + + return ret; +} + void set_ns_editmode(NSContainer *This) { nsIInterfaceRequestor *iface_req; @@ -637,6 +690,14 @@ static void handle_load_event(NSContainer *This, nsIDOMEvent *event) if(!This->doc) return; + if(This->editor_controller) { + nsIController_Release(This->editor_controller); + This->editor_controller = NULL; + } + + if(This->doc->usermode == EDITMODE) + This->editor_controller = get_editor_controller(This); + task = mshtml_alloc(sizeof(task_t)); task->doc = This->doc; @@ -1318,7 +1379,9 @@ static nsresult NSAPI nsDOMEventListener_HandleEvent(nsIDOMEventListener *iface, if(!strcmpW(loadW, type)) { handle_load_event(This, event); - }else if(This->doc && This->doc->usermode == EDITMODE) { + }else if(This->doc) { + update_doc(This->doc, UPDATE_UI); + if(This->doc->usermode == EDITMODE) handle_edit_event(This->doc, event); } @@ -1485,6 +1548,7 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) ret->ref = 1; ret->bscallback = NULL; ret->content_listener = NULL; + ret->editor_controller = NULL; if(parent) nsIWebBrowserChrome_AddRef(NSWBCHROME(parent)); @@ -1605,6 +1669,11 @@ void NSContainer_Release(NSContainer *This) nsIWebBrowserFocus_Release(This->focus); This->focus = NULL; + if(This->editor_controller) { + nsIController_Release(This->editor_controller); + This->editor_controller = NULL; + } + if(This->content_listener) { nsIURIContentListener_Release(This->content_listener); This->content_listener = NULL; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 73fc1e2..9643e61 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -111,6 +111,7 @@ typedef nsISupports nsIWebProgressListener; typedef nsISupports nsIDOMCSSValue; typedef nsISupports nsIDOMCSSRule; typedef nsISupports nsIPrintSession; +typedef nsISupports nsIControllerCommandTable; [ object, @@ -1611,6 +1612,30 @@ interface nsICommandManager : nsISupports [ object, + uuid(47b82b60-a36f-4167-8072-6f421151ed50) + /* NOT_FROZEN */ +] +interface nsIControllerContext : nsISupports +{ + nsresult Init(nsIControllerCommandTable *aCommandTable); + nsresult SetCommandContext(nsISupports *aCommandContext); +} + +[ + object, + uuid(d5b61b82-1da4-11d3-bf87-00105a1b0627) + /* NOT_FROZEN */ +] +interface nsIController : nsISupports +{ + nsresult IsCommandEnabled(const char *command, PRBool *_retval); + nsresult SupportsCommand(const char *command, PRBool *_retval); + nsresult DoCommand(const char *command); + nsresult OnEvent(const char *eventName); +} + +[ + object, uuid(d650439a-ca29-410d-a906-b0557fb62fcd) /* NOT_FROZEN */ ]

1 0

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

11 Jun '07

Module: wine Branch: master Commit: c135e0d8827ee1cc727fcd803497e9cf87f640d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c135e0d8827ee1cc727fcd803… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:48:36 2007 +0200 mshtml: Call update_doc in init_editor. --- dlls/mshtml/editor.c | 2 ++ dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 8b1c0f9..9c59dae 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -973,6 +973,8 @@ const cmdtable_t editmode_cmds[] = { void init_editor(HTMLDocument *This) { + update_doc(This, UPDATE_UI); + if(!This->nscontainer) return; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index fbffcbe..52053ae 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3331,6 +3331,7 @@ static void test_editing_mode(void) test_exec_editmode(unk); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_download(TRUE, FALSE); + test_timer(EXPECT_UPDATEUI); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED|OLECMDF_ENABLED); test_exec_fontname(unk, NULL, wszTimesNewRoman);

1 0

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

11 Jun '07

Module: wine Branch: master Commit: 86cb9f3d70e6218e8d1819a18891d3e2579c8e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86cb9f3d70e6218e8d1819a18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:47:52 2007 +0200 mshtml: Call update_doc in editor commands. --- dlls/mshtml/editor.c | 24 +++++++++++++++++++++++- dlls/mshtml/tests/htmldoc.c | 4 ++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 9ac1cd5..8b1c0f9 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -585,8 +585,10 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, { TRACE("(%p)->(%p %p)\n", This, in, out); - if(!This->nscontainer) + if(!This->nscontainer) { + update_doc(This, UPDATE_UI); return E_FAIL; + } if(in) { char *stra; @@ -658,6 +660,8 @@ static HRESULT exec_forecolor(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, }else { FIXME("unsupported in vt=%d\n", V_VT(in)); } + + update_doc(This, UPDATE_UI); } if(out) { @@ -704,6 +708,8 @@ static HRESULT exec_fontsize(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, default: FIXME("unsupported vt %d\n", V_VT(in)); } + + update_doc(This, UPDATE_UI); } return S_OK; @@ -719,6 +725,7 @@ static HRESULT exec_bold(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARI if(This->nscontainer) do_ns_command(This->nscontainer, NSCMD_BOLD, NULL); + update_doc(This, UPDATE_UI); return S_OK; } @@ -732,6 +739,7 @@ static HRESULT exec_italic(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VA if(This->nscontainer) do_ns_command(This->nscontainer, NSCMD_ITALIC, NULL); + update_doc(This, UPDATE_UI); return S_OK; } @@ -767,6 +775,7 @@ static HRESULT exec_justifycenter(HTMLDocument *This, DWORD cmdexecopt, VARIANT FIXME("unsupported args\n"); set_ns_align(This, NSALIGN_CENTER); + update_doc(This, UPDATE_UI); return S_OK; } @@ -778,13 +787,19 @@ static HRESULT exec_justifyleft(HTMLDocument *This, DWORD cmdexecopt, VARIANT *i FIXME("unsupported args\n"); set_ns_align(This, NSALIGN_LEFT); + update_doc(This, UPDATE_UI); return S_OK; } static HRESULT exec_justifyright(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + set_ns_align(This, NSALIGN_RIGHT); + update_doc(This, UPDATE_UI); return S_OK; } @@ -798,6 +813,7 @@ static HRESULT exec_underline(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(This->nscontainer) do_ns_command(This->nscontainer, NSCMD_UNDERLINE, NULL); + update_doc(This, UPDATE_UI); return S_OK; } @@ -811,6 +827,7 @@ static HRESULT exec_horizontalline(HTMLDocument *This, DWORD cmdexecopt, VARIANT if(This->nscontainer) do_ns_command(This->nscontainer, NSCMD_INSERTHR, NULL); + update_doc(This, UPDATE_UI); return S_OK; } @@ -824,6 +841,7 @@ static HRESULT exec_orderlist(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(This->nscontainer) do_ns_command(This->nscontainer, NSCMD_OL, NULL); + update_doc(This, UPDATE_UI); return S_OK; } @@ -837,6 +855,7 @@ static HRESULT exec_unorderlist(HTMLDocument *This, DWORD cmdexecopt, VARIANT *i if(This->nscontainer) do_ns_command(This->nscontainer, NSCMD_UL, NULL); + update_doc(This, UPDATE_UI); return S_OK; } @@ -850,6 +869,7 @@ static HRESULT exec_indent(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VA if(This->nscontainer) do_ns_command(This->nscontainer, NSCMD_INDENT, NULL); + update_doc(This, UPDATE_UI); return S_OK; } @@ -863,6 +883,7 @@ static HRESULT exec_outdent(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, V if(This->nscontainer) do_ns_command(This->nscontainer, NSCMD_OUTDENT, NULL); + update_doc(This, UPDATE_UI); return S_OK; } @@ -875,6 +896,7 @@ static HRESULT exec_composesettings(HTMLDocument *This, DWORD cmdexecopt, VARIAN FIXME("%s\n", debugstr_w(V_BSTR(in))); + update_doc(This, UPDATE_UI); return S_OK; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bbb64d8..fbffcbe 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3335,14 +3335,17 @@ static void test_editing_mode(void) test_exec_fontname(unk, NULL, wszTimesNewRoman); test_exec_fontname(unk, wszArial, wszTimesNewRoman); + test_timer(EXPECT_UPDATEUI); test_exec_fontname(unk, NULL, wszArial); test_exec_noargs(unk, IDM_JUSTIFYRIGHT); + test_timer(EXPECT_UPDATEUI); if(!nogecko) test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED); test_exec_noargs(unk, IDM_JUSTIFYCENTER); + test_timer(EXPECT_UPDATEUI); test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, OLECMDF_SUPPORTED|OLECMDF_ENABLED); if(!nogecko) @@ -3350,6 +3353,7 @@ static void test_editing_mode(void) OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED); test_exec_noargs(unk, IDM_HORIZONTALLINE); + test_timer(EXPECT_UPDATEUI); test_QueryStatus(unk, &CGID_MSHTML, IDM_HORIZONTALLINE, OLECMDF_SUPPORTED|OLECMDF_ENABLED);

1 0