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

Jacek Caban : mshtml: Don't check out variant type in exec_fontname.
by Alexandre Julliard 11 Jun '07

11 Jun '07

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: Set FALSE useCapture for editor' s keypress event listener.
by Alexandre Julliard 11 Jun '07

11 Jun '07

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: Push TASK_PARSECOMPLETE in load event if Gecko is available.
by Alexandre Julliard 11 Jun '07

11 Jun '07

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 default fontname to 'Times New Roman'.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 52accda0fa1128b78260e37e7e924861a3586060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52accda0fa1128b78260e37e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:44:38 2007 +0200 mshtml: Set default fontname to 'Times New Roman'. --- dlls/mshtml/editor.c | 29 ++++++++++++++++++++++++----- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/task.c | 3 +++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 7bebe3d..9ac1cd5 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -572,6 +572,15 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) nsIDOMKeyEvent_Release(key_event); } +static void set_ns_fontname(NSContainer *This, const char *fontname) +{ + nsICommandParams *nsparam = create_nscommand_params(); + + nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, fontname); + do_ns_command(This, NSCMD_FONTFACE, nsparam); + nsICommandParams_Release(nsparam); +} + static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { TRACE("(%p)->(%p %p)\n", This, in, out); @@ -580,7 +589,6 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return E_FAIL; if(in) { - nsICommandParams *nsparam = create_nscommand_params(); char *stra; DWORD len; @@ -589,15 +597,17 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return E_INVALIDARG; } + TRACE("%s\n", debugstr_w(V_BSTR(in))); + len = WideCharToMultiByte(CP_ACP, 0, V_BSTR(in), -1, NULL, 0, NULL, NULL); stra = mshtml_alloc(len); WideCharToMultiByte(CP_ACP, 0, V_BSTR(in), -1, stra, -1, NULL, NULL); - nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, stra); - mshtml_free(stra); - do_ns_command(This->nscontainer, NSCMD_FONTFACE, nsparam); + set_ns_fontname(This->nscontainer, stra); - nsICommandParams_Release(nsparam); + mshtml_free(stra); + + update_doc(This, UPDATE_UI); } if(out) { @@ -621,6 +631,7 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, MultiByteToWideChar(CP_ACP, 0, stra, -1, strw, -1); nsfree(stra); + V_VT(out) = VT_BSTR; V_BSTR(out) = SysAllocString(strw); mshtml_free(strw); } @@ -937,3 +948,11 @@ const cmdtable_t editmode_cmds[] = { {IDM_COMPOSESETTINGS, NULL, exec_composesettings}, {0,NULL,NULL} }; + +void init_editor(HTMLDocument *This) +{ + if(!This->nscontainer) + return; + + set_ns_fontname(This->nscontainer, "Times New Roman"); +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9668fcd..468dd6c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -391,6 +391,7 @@ void update_doc(HTMLDocument *This, DWORD flags); void update_title(HTMLDocument*); /* editor */ +void init_editor(HTMLDocument*); void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 057f227..540c969 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -132,6 +132,9 @@ static void set_parsecomplete(HTMLDocument *doc) TRACE("(%p)\n", doc); + if(doc->usermode == EDITMODE) + init_editor(doc); + call_property_onchanged(doc->cp_propnotif, 1005); doc->readystate = READYSTATE_INTERACTIVE;

1 0

Jacek Caban : mshtml: Added Exec(IDM_FONTNAME) tests.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 3543cd3df42f86e1918831a4bd55ea9431860db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3543cd3df42f86e1918831a4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:45:24 2007 +0200 mshtml: Added Exec(IDM_FONTNAME) tests. --- dlls/mshtml/tests/Makefile.in | 2 +- dlls/mshtml/tests/htmldoc.c | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index e3440d0..8ddcb50 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = mshtml.dll -IMPORTS = ole32 user32 urlmon advapi32 kernel32 +IMPORTS = ole32 oleaut32 user32 urlmon advapi32 kernel32 EXTRALIBS = -luuid CTESTS = \ diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 792074d..40cb44e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -150,6 +150,12 @@ static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c', static HRESULT QueryInterface(REFIID riid, void **ppv); static void test_readyState(IUnknown*); static void test_MSHTML_QueryStatus(IUnknown*,DWORD); +static BOOL nogecko = FALSE; + +static const WCHAR wszTimesNewRoman[] = + {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; +static const WCHAR wszArial[] = + {'A','r','i','a','l',0}; #define EXPECT_UPDATEUI 1 #define EXPECT_SETTITLE 2 @@ -2321,6 +2327,8 @@ static void test_download(BOOL verb_done, BOOL css_dwl) SET_CALLED(Terminate); SET_CALLED(Protocol_Read); SET_CALLED(UnlockRequest); + + nogecko = TRUE; } } CHECK_CALLED(OnChanged_1005); @@ -2608,6 +2616,46 @@ static void test_exec_editmode(IUnknown *unk) ok(hres == S_OK, "Exec failed: %08x\n", hres); } +static void test_exec_fontname(IUnknown *unk, LPCWSTR name, LPCWSTR exname) +{ + IOleCommandTarget *cmdtrg; + VARIANT *in = NULL, _in, *out = NULL, _out; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "QueryInterface(IIDIOleM=CommandTarget failed: %08x\n", hres); + if(FAILED(hres)) + return; + + if(name) { + in = &_in; + V_VT(in) = VT_BSTR; + V_BSTR(in) = SysAllocString(name); + } + + if(exname) { + out = &_out; + V_VT(out) = VT_I4; + V_I4(out) = 0xdeadbeef; + } + + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_FONTNAME, 0, in, out); + if(!nogecko) + ok(hres == S_OK, "Exec(IDM_FONTNAME) failed: %08x\n", hres); + + if(in) + VariantClear(in); + + if(out && !nogecko) { + ok(V_VT(out) == VT_BSTR, "V_VT(out) = %x\n", V_VT(out)); + if(V_VT(out) == VT_BSTR) + ok(!lstrcmpW(V_BSTR(out), name ? name : exname), "unexpected fontname\n"); + VariantClear(out); + } + + IOleCommandTarget_Release(cmdtrg); +} + static HWND create_container_window(void) { static const WCHAR wszHTMLDocumentTest[] = @@ -3268,6 +3316,10 @@ static void test_editing_mode(void) test_download(TRUE, FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED|OLECMDF_ENABLED); + test_exec_fontname(unk, NULL, wszTimesNewRoman); + test_exec_fontname(unk, wszArial, wszTimesNewRoman); + test_exec_fontname(unk, NULL, wszArial); + test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE);

1 0

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

11 Jun '07

Module: wine Branch: master Commit: 88178a7553a96dd654466106622909201a7550ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=88178a7553a96dd6544661066… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:45:58 2007 +0200 mshtml: Added more command tests. --- dlls/mshtml/tests/htmldoc.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 40cb44e..bbb64d8 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2656,6 +2656,23 @@ static void test_exec_fontname(IUnknown *unk, LPCWSTR name, LPCWSTR exname) IOleCommandTarget_Release(cmdtrg); } +static void test_exec_noargs(IUnknown *unk, DWORD cmdid) +{ + IOleCommandTarget *cmdtrg; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, cmdid, + OLECMDEXECOPT_DODEFAULT, NULL, NULL); + ok(hres == S_OK, "Exec failed: %08x\n", hres); + + IOleCommandTarget_Release(cmdtrg); +} + static HWND create_container_window(void) { static const WCHAR wszHTMLDocumentTest[] = @@ -3320,6 +3337,22 @@ static void test_editing_mode(void) test_exec_fontname(unk, wszArial, wszTimesNewRoman); test_exec_fontname(unk, NULL, wszArial); + test_exec_noargs(unk, IDM_JUSTIFYRIGHT); + if(!nogecko) + test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, + OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED); + + test_exec_noargs(unk, IDM_JUSTIFYCENTER); + test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, + OLECMDF_SUPPORTED|OLECMDF_ENABLED); + if(!nogecko) + test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYCENTER, + OLECMDF_SUPPORTED|OLECMDF_ENABLED|OLECMDF_LATCHED); + + test_exec_noargs(unk, IDM_HORIZONTALLINE); + test_QueryStatus(unk, &CGID_MSHTML, IDM_HORIZONTALLINE, + OLECMDF_SUPPORTED|OLECMDF_ENABLED); + test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE); test_Close(unk, FALSE);

1 0

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

11 Jun '07

Module: wine Branch: master Commit: ec24f20bb1986ae1b37c186b5647afff8006681d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec24f20bb1986ae1b37c186b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:49:56 2007 +0200 mshtml: Added editor mode up key implementation. --- dlls/mshtml/editor.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 9c59dae..4c1485d 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -44,8 +44,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_INDENT "cmd_indent" #define NSCMD_INSERTHR "cmd_insertHR" #define NSCMD_ITALIC "cmd_italic" +#define NSCMD_LINEPREVIOUS "cmd_linePrevious" +#define NSCMD_MOVEPAGEUP "cmd_movePageUp" #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" +#define NSCMD_SELECTLINEPREVIOUS "cmd_selectLinePrevious" +#define NSCMD_SELECTPAGEUP "cmd_selectPageUp" #define NSCMD_UL "cmd_ul" #define NSCMD_UNDERLINE "cmd_underline" @@ -94,6 +98,18 @@ static void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams * nsICommandManager_Release(cmdmgr); } +static void do_ns_editor_command(NSContainer *This, const char *cmd) +{ + nsresult nsres; + + if(!This->editor_controller) + return; + + nsres = nsIController_DoCommand(This->editor_controller, cmd); + if(NS_FAILED(nsres)) + ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres); +} + static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsICommandParams *nsparam) { nsICommandManager *cmdmgr; @@ -550,6 +566,24 @@ static void collapse_next_char(HTMLDocument *doc, nsIDOMKeyEvent *event, BOOL ne nsISelection_Release(selection); } +static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char **cmds) +{ + int i=0; + PRBool b; + + nsIDOMKeyEvent_GetCtrlKey(event, &b); + if(b) + i |= 1; + + nsIDOMKeyEvent_GetShiftKey(event, &b); + if(b) + i |= 2; + + do_ns_editor_command(This->nscontainer, cmds[i]); + + nsIDOMKeyEvent_PreventDefault(event); +} + void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) { nsIDOMKeyEvent *key_event; @@ -567,6 +601,18 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) case DOM_VK_RIGHT: TRACE("right\n"); collapse_next_char(This, key_event, TRUE); + break; + case DOM_VK_UP: { + static const char *cmds[] = { + NSCMD_LINEPREVIOUS, + NSCMD_MOVEPAGEUP, + NSCMD_SELECTLINEPREVIOUS, + NSCMD_SELECTPAGEUP + }; + + handle_arrow_key(This, key_event, cmds); + break; + } }; nsIDOMKeyEvent_Release(key_event);

1 0

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

11 Jun '07

Module: wine Branch: master Commit: 77be7f7b1c4b8ad07df9ca68a4665a72164ad33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77be7f7b1c4b8ad07df9ca68a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:52:14 2007 +0200 mshtml: Reimplement editor mode left key using command controller. --- dlls/mshtml/editor.c | 130 ++++++-------------------------------------------- 1 files changed, 15 insertions(+), 115 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index c47740b..12a43e1 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2006-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 @@ -40,6 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_ALIGN "cmd_align" #define NSCMD_BOLD "cmd_bold" #define NSCMD_CHARNEXT "cmd_charNext" +#define NSCMD_CHARPREVIOUS "cmd_charPrevious" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" @@ -52,14 +53,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" #define NSCMD_SELECTCHARNEXT "cmd_selectCharNext" +#define NSCMD_SELECTCHARPREVIOUS "cmd_selectCharPrevious" #define NSCMD_SELECTLINENEXT "cmd_selectLineNext" #define NSCMD_SELECTLINEPREVIOUS "cmd_selectLinePrevious" #define NSCMD_SELECTPAGEDOWN "cmd_selectPageDown" #define NSCMD_SELECTPAGEUP "cmd_selectPageUp" #define NSCMD_SELECTWORDNEXT "cmd_selectWordNext" +#define NSCMD_SELECTWORDPREVIOUS "cmd_selectWordPrevious" #define NSCMD_UL "cmd_ul" #define NSCMD_UNDERLINE "cmd_underline" #define NSCMD_WORDNEXT "cmd_wordNext" +#define NSCMD_WORDPREVIOUS "cmd_wordPrevious" #define NSSTATE_ATTRIBUTE "state_attribute" #define NSSTATE_ALL "state_all" @@ -462,118 +466,6 @@ static nsIDOMNode *get_child_text_node(nsIDOMNode *node, BOOL first) return NULL; } -static nsIDOMNode *get_next_text_node(nsIDOMNode *node, BOOL next) -{ - nsIDOMNode *iter, *iter2 = NULL, *parent = NULL; - PRUint16 node_type; - - iter = node; - nsIDOMNode_AddRef(iter); - - while(1) { - if(next) - nsIDOMNode_GetNextSibling(iter, &iter2); - else - nsIDOMNode_GetPreviousSibling(iter, &iter2); - - while(!iter2) { - nsIDOMNode_GetParentNode(iter, &parent); - nsIDOMNode_Release(iter); - if(!parent) - return NULL; - - iter = parent; - - if(next) - nsIDOMNode_GetNextSibling(iter, &iter2); - else - nsIDOMNode_GetPreviousSibling(iter, &iter2); - } - - nsIDOMNode_Release(iter); - iter = iter2; - - nsIDOMNode_GetNodeType(iter, &node_type); - - switch(node_type) { - case TEXT_NODE: - if(is_visible_text_node(iter)) - return iter; - case ELEMENT_NODE: - iter2 = get_child_text_node(iter, next); - if(iter2) { - nsIDOMNode_Release(iter); - return iter2; - } - } - } - - return NULL; -} - -static void collapse_end_node(nsISelection *selection, nsIDOMNode *node) -{ - nsIDOMCharacterData *char_data; - PRUint32 len; - - nsIDOMNode_QueryInterface(node, &IID_nsIDOMCharacterData, (void**)&char_data); - nsIDOMCharacterData_GetLength(char_data, &len); - nsIDOMCharacterData_Release(char_data); - - nsISelection_Collapse(selection, node, len); -} - -static void collapse_next_char(HTMLDocument *doc, nsIDOMKeyEvent *event, BOOL next) -{ - nsISelection *selection = get_ns_selection(doc); - nsIDOMNode *node; - PRBool collapsed, b; - PRUint16 node_type; - nsIDOMNode *text_node; - - nsIDOMKeyEvent_GetCtrlKey(event, &b); - if(b) return; - - nsIDOMKeyEvent_GetShiftKey(event, &b); - if(b) return; - - nsISelection_GetIsCollapsed(selection, &collapsed); - if(!collapsed) - nsISelection_CollapseToEnd(selection); - - nsISelection_GetFocusNode(selection, &node); - nsIDOMNode_GetNodeType(node, &node_type); - - if(node_type == TEXT_NODE) { - nsIDOMCharacterData *char_data; - PRInt32 offset; - PRUint32 len; - - nsISelection_GetFocusOffset(selection, &offset); - - nsIDOMNode_QueryInterface(node, &IID_nsIDOMCharacterData, (void**)&char_data); - nsIDOMCharacterData_GetLength(char_data, &len); - nsIDOMCharacterData_Release(char_data); - - if(next ? offset != len : offset) { - nsISelection_Collapse(selection, node, offset + (next?1:-1)); - return; - } - } - - text_node = get_next_text_node(node, next); - if(text_node) { - if(next) - nsISelection_Collapse(selection, text_node, 1); - else - collapse_end_node(selection, text_node); - nsIDOMNode_Release(text_node); - } - - nsIDOMNode_Release(node); - nsISelection_Release(selection); -} - static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char **cmds) { int i=0; @@ -602,10 +494,18 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) nsIDOMKeyEvent_GetKeyCode(key_event, &code); switch(code) { - case DOM_VK_LEFT: + case DOM_VK_LEFT: { + static const char *cmds[] = { + NSCMD_CHARPREVIOUS, + NSCMD_WORDPREVIOUS, + NSCMD_SELECTCHARPREVIOUS, + NSCMD_SELECTWORDPREVIOUS + }; + TRACE("left\n"); - collapse_next_char(This, key_event, FALSE); + handle_arrow_key(This, key_event, cmds); break; + } case DOM_VK_RIGHT: { static const char *cmds[] = { NSCMD_CHARNEXT,

1 0

Jacek Caban : mshtml: Added test of callbacks called from document timer.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 1e2ec943256c8d4081c7871403c657b41c2e5b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2ec943256c8d4081c787140… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:40:50 2007 +0200 mshtml: Added test of callbacks called from document timer. --- dlls/mshtml/tests/htmldoc.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 083181a..9033c55 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -151,6 +151,35 @@ static HRESULT QueryInterface(REFIID riid, void **ppv); static void test_readyState(IUnknown*); static void test_MSHTML_QueryStatus(IUnknown*,DWORD); +#define EXPECT_UPDATEUI 1 +#define EXPECT_SETTITLE 2 + +static void test_timer(DWORD flags) +{ + BOOL *b = &called_Exec_SETTITLE; + MSG msg; + + if(flags & EXPECT_UPDATEUI) { + SET_EXPECT(UpdateUI); + SET_EXPECT(Exec_UPDATECOMMANDS); + b = &called_UpdateUI; + } + if(flags & EXPECT_SETTITLE) + SET_EXPECT(Exec_SETTITLE); + + while(!*b && GetMessage(&msg, hwnd, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + if(flags & EXPECT_UPDATEUI) { + CHECK_CALLED(UpdateUI); + CHECK_CALLED(Exec_UPDATECOMMANDS); + } + if(flags & EXPECT_SETTITLE) + CHECK_CALLED(Exec_SETTITLE); +} + static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { @@ -1493,6 +1522,8 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum } } + test_timer(EXPECT_UPDATEUI | ((load_state == LD_LOADING) ? EXPECT_SETTITLE : 0)); + if(activeobj) IOleInPlaceActiveObject_Release(activeobj); } @@ -2258,7 +2289,6 @@ static void test_download(BOOL verb_done, BOOL css_dwl) SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); - SET_EXPECT(Exec_SETTITLE); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!called_Exec_HTTPEQUIV_DONE && GetMessage(&msg, hwnd, 0, 0)) { @@ -2299,7 +2329,6 @@ static void test_download(BOOL verb_done, BOOL css_dwl) CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); - CHECK_CALLED(Exec_SETTITLE); load_state = LD_COMPLETE; @@ -2568,6 +2597,8 @@ static void test_exec_editmode(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(OnChanged_READYSTATE); + test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); + IOleCommandTarget_Release(cmdtrg); editmode = TRUE; @@ -3016,6 +3047,8 @@ static void test_StreamLoad(IUnknown *unk) CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Read); + test_timer(EXPECT_SETTITLE); + IPersistStreamInit_Release(init); }

1 0

Jacek Caban : mshtml: Move Exec(OLECMDID_SETTITLE) call to separated function and use it in on_timer.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 20d77432a25c61f970111ea8606194943ddcaa13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d77432a25c61f970111ea86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:39:39 2007 +0200 mshtml: Move Exec(OLECMDID_SETTITLE) call to separated function and use it in on_timer. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 1 + dlls/mshtml/task.c | 15 +++------------ dlls/mshtml/view.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7dd54bd..9668fcd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -388,6 +388,7 @@ extern const cmdtable_t editmode_cmds[]; #define UPDATE_TITLE 0x0002 void update_doc(HTMLDocument *This, DWORD flags); +void update_title(HTMLDocument*); /* editor */ void set_ns_editmode(NSContainer*); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 8045241..cb1025b 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -153,6 +153,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO This->readystate = READYSTATE_LOADING; call_property_onchanged(This->cp_propnotif, DISPID_READYSTATE); + update_doc(This, UPDATE_TITLE); HTMLDocument_LockContainer(This, TRUE); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 8949cdf..057f227 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -155,6 +155,8 @@ static void set_parsecomplete(HTMLDocument *doc) IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + + IOleCommandTarget_Release(olecmd); } doc->readystate = READYSTATE_COMPLETE; @@ -165,18 +167,7 @@ static void set_parsecomplete(HTMLDocument *doc) IOleInPlaceFrame_SetStatusText(doc->frame, wszDone); } - if(olecmd) { - VARIANT title; - WCHAR empty[] = {0}; - - V_VT(&title) = VT_BSTR; - V_BSTR(&title) = SysAllocString(empty); - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETTITLE, OLECMDEXECOPT_DONTPROMPTUSER, - &title, NULL); - SysFreeString(V_BSTR(&title)); - - IOleCommandTarget_Release(olecmd); - } + update_title(doc); } static void set_progress(HTMLDocument *doc) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 238ed09..4c7cea9 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -104,6 +104,34 @@ void update_doc(HTMLDocument *This, DWORD flags) This->update |= flags; } +void update_title(HTMLDocument *This) +{ + IOleCommandTarget *olecmd; + HRESULT hres; + + if(!(This->update & UPDATE_TITLE)) + return; + + This->update &= ~UPDATE_TITLE; + + if(!This->client) + return; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + VARIANT title; + WCHAR empty[] = {0}; + + V_VT(&title) = VT_BSTR; + V_BSTR(&title) = SysAllocString(empty); + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETTITLE, OLECMDEXECOPT_DONTPROMPTUSER, + &title, NULL); + SysFreeString(V_BSTR(&title)); + + IOleCommandTarget_Release(olecmd); + } +} + static LRESULT on_timer(HTMLDocument *This) { TRACE("(%p) %x\n", This, This->update); @@ -131,6 +159,7 @@ static LRESULT on_timer(HTMLDocument *This) } } + update_title(This); This->update = 0; return 0; }

1 0