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

Jacek Caban : mshtml: Push TASK_PARSECOMPLETE in load event if Gecko is available.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: d09692d18795c3f2b27d45e3e7b008976072d7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09692d18795c3f2b27d45e3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:42:37 2007 +0200 mshtml: Push TASK_PARSECOMPLETE in load event if Gecko is available. --- dlls/mshtml/navigate.c | 4 +- dlls/mshtml/nsembed.c | 54 +++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index dd7d78d..2303baf 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -404,7 +404,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac } } - if(This->doc) { + if(This->doc && !This->doc->nscontainer) { task_t *task = mshtml_alloc(sizeof(task_t)); task->doc = This->doc; @@ -413,7 +413,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac /* * This should be done in the worker thread that parses HTML, - * but we don't have such thread (Gecko parses HTML for us). + * but we don't have such thread. */ push_task(task); } diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index a5dd2d5..5c4cfd3 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -628,6 +628,28 @@ void set_ns_editmode(NSContainer *This) nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); } +static void handle_load_event(NSContainer *This, nsIDOMEvent *event) +{ + task_t *task; + + TRACE("(%p)\n", This); + + if(!This->doc) + return; + + task = mshtml_alloc(sizeof(task_t)); + + task->doc = This->doc; + task->task_id = TASK_PARSECOMPLETE; + task->next = NULL; + + /* + * This should be done in the worker thread that parses HTML, + * but we don't have such thread (Gecko parses HTML for us). + */ + push_task(task); +} + void close_gecko(void) { TRACE("()\n"); @@ -1283,11 +1305,24 @@ static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) static nsresult NSAPI nsDOMEventListener_HandleEvent(nsIDOMEventListener *iface, nsIDOMEvent *event) { NSContainer *This = NSEVENTLIST_THIS(iface); + nsAString type_str; + const PRUnichar *type; - TRACE("(%p)->(%p)\n", This, event); + static const PRUnichar loadW[] = {'l','o','a','d',0}; - if(This->doc->usermode == EDITMODE) - handle_edit_event(This->doc, event); + nsAString_Init(&type_str, NULL); + nsIDOMEvent_GetType(event, &type_str); + nsAString_GetData(&type_str, &type, NULL); + + TRACE("(%p)->(%p) %s\n", This, event, debugstr_w(type)); + + if(!strcmpW(loadW, type)) { + handle_load_event(This, event); + }else if(This->doc && This->doc->usermode == EDITMODE) { + handle_edit_event(This->doc, event); + } + + nsAString_Finish(&type_str); return NS_OK; } @@ -1519,14 +1554,23 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) nsres = nsIDOMWindow_QueryInterface(dom_window, &IID_nsIDOMEventTarget, (void**)&target); nsIDOMWindow_Release(dom_window); if(NS_SUCCEEDED(nsres)) { - nsAString keypress_str; + nsAString keypress_str, load_str; static const PRUnichar wsz_keypress[] = {'k','e','y','p','r','e','s','s',0}; + static const PRUnichar wsz_load[] = {'l','o','a','d',0}; + nsAString_Init(&keypress_str, wsz_keypress); nsres = nsIDOMEventTarget_AddEventListener(target, &keypress_str, NSEVENTLIST(ret), TRUE); nsAString_Finish(&keypress_str); - nsIDOMEventTarget_Release(target); if(NS_FAILED(nsres)) ERR("AddEventTarget failed: %08x\n", nsres); + + nsAString_Init(&load_str, wsz_load); + nsres = nsIDOMEventTarget_AddEventListener(target, &load_str, NSEVENTLIST(ret), TRUE); + nsAString_Finish(&load_str); + if(NS_FAILED(nsres)) + ERR("AddEventTarget failed: %08x\n", nsres); + + nsIDOMEventTarget_Release(target); }else { ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); }

1 0

Jacek Caban : mshtml: Set FALSE useCapture for editor' s keypress event listener.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 85923633bb1b3e7e7a7b6f6bca0960c47213e7b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85923633bb1b3e7e7a7b6f6bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:43:13 2007 +0200 mshtml: Set FALSE useCapture for editor's keypress event listener. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5c4cfd3..832298b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1559,7 +1559,7 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) static const PRUnichar wsz_load[] = {'l','o','a','d',0}; nsAString_Init(&keypress_str, wsz_keypress); - nsres = nsIDOMEventTarget_AddEventListener(target, &keypress_str, NSEVENTLIST(ret), TRUE); + nsres = nsIDOMEventTarget_AddEventListener(target, &keypress_str, NSEVENTLIST(ret), FALSE); nsAString_Finish(&keypress_str); if(NS_FAILED(nsres)) ERR("AddEventTarget failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Don't check out variant type in exec_fontname.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 80b65d3e35f1744f1799e816f0052a6949082a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b65d3e35f1744f1799e816f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:43:53 2007 +0200 mshtml: Don't check out variant type in exec_fontname. --- dlls/mshtml/editor.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 03cc546..7bebe3d 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -607,11 +607,6 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, DWORD len; nsresult nsres; - if(V_VT(out) != VT_BSTR) { - FIXME("Unsupported vt=%d\n", V_VT(out)); - return E_INVALIDARG; - } - nsparam = create_nscommand_params(); nsres = get_ns_command_state(This->nscontainer, NSCMD_FONTFACE, nsparam);

1 0

Jacek Caban : mshtml: Call update_doc in init_editor.
by Alexandre Julliard June 11, 2007

June 11, 2007

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 June 11, 2007

June 11, 2007

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

Jacek Caban : mshtml: Store editor controller in NSContainer.
by Alexandre Julliard June 11, 2007

June 11, 2007

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: Added editor mode down key implementation.
by Alexandre Julliard June 11, 2007

June 11, 2007

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: Reimplement editor mode right key using command controller.
by Alexandre Julliard June 11, 2007

June 11, 2007

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: Improve IDM_JUSTIFYLEFT query status.
by Alexandre Julliard June 11, 2007

June 11, 2007

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: Pump messages of all windows in test_download.
by Alexandre Julliard June 11, 2007

June 11, 2007

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