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

Jacek Caban : mshtml: Silence invalid FIXME for ELEMENT_DOCUMENT_FRAGMENT_NODE in nsnode_to_nsstring_rec .
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 21d61dae88e0f0eba2e78bf093301238dd8261c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d61dae88e0f0eba2e78bf09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:54:11 2007 +0200 mshtml: Silence invalid FIXME for ELEMENT_DOCUMENT_FRAGMENT_NODE in nsnode_to_nsstring_rec. --- dlls/mshtml/nsembed.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index df6bcf3..4282789 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -520,6 +520,8 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode nsIDOMDocument_Release(nsdoc); break; } + case DOCUMENT_FRAGMENT_NODE: + break; default: FIXME("Unhandled type %u\n", type); }

1 0

Jacek Caban : mshtml: Added COMMENT_NODE implementation in nsnode_to_nsstring_rec.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 9e3021746cbd5b4a71a3da3ccac74e2d58385bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3021746cbd5b4a71a3da3cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:54:51 2007 +0200 mshtml: Added COMMENT_NODE implementation in nsnode_to_nsstring_rec. --- dlls/mshtml/nsembed.c | 6 ++++++ dlls/mshtml/nsiface.idl | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4282789..40225d5 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -513,6 +513,12 @@ static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode nsIDOMText_Release(nstext); break; } + case COMMENT_NODE: { + nsIDOMComment *nscomment; + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMComment, (void**)&nscomment); + nsres = nsIContentSerializer_AppendComment(serializer, nscomment, 0, -1, str); + break; + } case DOCUMENT_NODE: { nsIDOMDocument *nsdoc; nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMDocument, (void**)&nsdoc); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 347fd49..cc7ae35 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -99,7 +99,6 @@ typedef nsISupports nsIDOMNamedNodeMap; typedef nsISupports nsIDOMAttr; typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; -typedef nsISupports nsIDOMComment; typedef nsISupports nsIDOMCDATASection; typedef nsISupports nsIDOMProcessingInstruction; typedef nsISupports nsIDOMEntityReference; @@ -594,6 +593,15 @@ interface nsIDOMText : nsIDOMCharacterData [ object, + uuid(a6cf9073-15b3-11d2-932e-00805f8add32) + /* FROZEN */ +] +interface nsIDOMComment : nsIDOMCharacterData +{ +} + +[ + object, uuid(a6cf9076-15b3-11d2-932e-00805f8add32) /* FROZEN */ ] @@ -1152,6 +1160,7 @@ interface nsIWebBrowserPrint : nsISupports [ object, uuid(919e792a-6490-40b8-bba5-f9e9ad5640c8) + /* NOT_FROZEN */ ] interface nsIScrollable : nsISupports {

1 0

Jacek Caban : mshtml: Added edit mode IDM_COPY implementation.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 4231c9e2ee4bac80396db7ed47944b9c194d7597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4231c9e2ee4bac80396db7ed4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:28:48 2007 +0200 mshtml: Added edit mode IDM_COPY implementation. --- dlls/mshtml/editor.c | 12 ++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6edf951..432f48c 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_BOLD "cmd_bold" #define NSCMD_CHARNEXT "cmd_charNext" #define NSCMD_CHARPREVIOUS "cmd_charPrevious" +#define NSCMD_COPY "cmd_copy" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" @@ -933,6 +934,17 @@ static HRESULT exec_composesettings(HTMLDocument *This, DWORD cmdexecopt, VARIAN return S_OK; } +HRESULT editor_exec_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + update_doc(This, UPDATE_UI); + + if(!This->nscontainer) + return E_FAIL; + + do_ns_editor_command(This->nscontainer, NSCMD_COPY); + return S_OK; +} + static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) { switch(cmd->cmdID) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 44d6645..33806f6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -398,6 +398,7 @@ void update_title(HTMLDocument*); void init_editor(HTMLDocument*); void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); +HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8f8837d..61deb68 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -469,7 +469,12 @@ static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(This->usermode == EDITMODE) + return editor_exec_copy(This, cmdexecopt, in, out); + + FIXME("Unimplemented in browse mode\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added edit mode IDM_CUT implementation.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 371b0edb8ed21065da56bd76dfe12afbd2157026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371b0edb8ed21065da56bd76d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:30:30 2007 +0200 mshtml: Added edit mode IDM_CUT implementation. --- dlls/mshtml/editor.c | 12 ++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 4630cfb..d257c5f 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_CHARNEXT "cmd_charNext" #define NSCMD_CHARPREVIOUS "cmd_charPrevious" #define NSCMD_COPY "cmd_copy" +#define NSCMD_CUT "cmd_cut" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" @@ -946,6 +947,17 @@ HRESULT editor_exec_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARI return S_OK; } +HRESULT editor_exec_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + update_doc(This, UPDATE_UI); + + if(!This->nscontainer) + return E_FAIL; + + do_ns_editor_command(This->nscontainer, NSCMD_CUT); + return S_OK; +} + HRESULT editor_exec_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { update_doc(This, UPDATE_UI); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4c4ee4a..74ee748 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -399,6 +399,7 @@ void init_editor(HTMLDocument*); void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); +HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index e2b749c..288a12b 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -487,7 +487,12 @@ static HRESULT query_mshtml_cut(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(This->usermode == EDITMODE) + return editor_exec_cut(This, cmdexecopt, in, out); + + FIXME("Unimplemented in browse mode\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added edit mode IDM_PASTE implementation.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 775425b24bad6a3bea8353aaca0c206cd1476740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775425b24bad6a3bea8353aac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 00:29:53 2007 +0200 mshtml: Added edit mode IDM_PASTE implementation. --- dlls/mshtml/editor.c | 12 ++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 432f48c..4630cfb 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -53,6 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_MOVEPAGEUP "cmd_movePageUp" #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" +#define NSCMD_PASTE "cmd_paste" #define NSCMD_SELECTCHARNEXT "cmd_selectCharNext" #define NSCMD_SELECTCHARPREVIOUS "cmd_selectCharPrevious" #define NSCMD_SELECTLINENEXT "cmd_selectLineNext" @@ -945,6 +946,17 @@ HRESULT editor_exec_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARI return S_OK; } +HRESULT editor_exec_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + update_doc(This, UPDATE_UI); + + if(!This->nscontainer) + return E_FAIL; + + do_ns_editor_command(This->nscontainer, NSCMD_PASTE); + return S_OK; +} + static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) { switch(cmd->cmdID) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 33806f6..4c4ee4a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -399,6 +399,7 @@ void init_editor(HTMLDocument*); void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); +HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 61deb68..e2b749c 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -500,7 +500,12 @@ static HRESULT query_mshtml_paste(HTMLDocument *This, OLECMD *cmd) static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(This->usermode == EDITMODE) + return editor_exec_paste(This, cmdexecopt, in, out); + + FIXME("Unimplemented in browse mode\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Reimplement editor mode left key using command controller.
by Alexandre Julliard June 11, 2007

June 11, 2007

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

June 11, 2007

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: Added more command tests.
by Alexandre Julliard June 11, 2007

June 11, 2007

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 Exec(IDM_FONTNAME) tests.
by Alexandre Julliard June 11, 2007

June 11, 2007

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: Set default fontname to 'Times New Roman'.
by Alexandre Julliard June 11, 2007

June 11, 2007

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