mshtml: Added Exec(IDM_FONTSIZE) implementation.

dlls/mshtml/Makefile.in

@@ -10,6 +10,7 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
 	conpoint.c \
+	editor.c \
 	hlink.c \
 	htmlbody.c \
 	htmldoc.c \

dlls/mshtml/editor.c

+/*
+ * Copyright 2006 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "ole2.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+#include "mshtml_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
+
+static const WCHAR wszFont[] = {'f','o','n','t',0};
+static const WCHAR wszSize[] = {'s','i','z','e',0};
+
+static nsISelection *get_ns_selection(HTMLDocument *This)
+{
+    nsIDOMWindow *dom_window;
+    nsISelection *nsselection = NULL;
+    nsresult nsres;
+
+    if(!This->nscontainer)
+        return NULL;
+
+    nsres = nsIWebBrowser_GetContentDOMWindow(This->nscontainer->webbrowser, &dom_window);
+    if(NS_FAILED(nsres))
+        return NULL;
+
+    nsIDOMWindow_GetSelection(dom_window, &nsselection);
+    nsIDOMWindow_Release(dom_window);
+
+    return nsselection;
+
+}
+
+static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_str)
+{
+    PRBool has_children;
+    PRUint32 child_cnt, i;
+    nsIDOMNode *child_node;
+    nsIDOMNodeList *node_list;
+    PRUint16 node_type;
+
+    nsIDOMElement_HasChildNodes(elem, &has_children);
+    if(!has_children)
+        return;
+
+    nsIDOMElement_GetChildNodes(elem, &node_list);
+    nsIDOMNodeList_GetLength(node_list, &child_cnt);
+
+    for(i=0; i<child_cnt; i++) {
+        nsIDOMNodeList_Item(node_list, i, &child_node);
+
+        nsIDOMNode_GetNodeType(child_node, &node_type);
+        if(node_type == ELEMENT_NODE) {
+            nsIDOMElement *child_elem;
+            nsAString tag_str;
+            const PRUnichar *ctag;
+
+            nsIDOMNode_QueryInterface(child_node, &IID_nsIDOMElement, (void**)&child_elem);
+
+            nsAString_Init(&tag_str, NULL);
+            nsIDOMElement_GetTagName(child_elem, &tag_str);
+            nsAString_GetData(&tag_str, &ctag, NULL);
+
+            if(!strcmpiW(ctag, tag))
+                /* FIXME: remove node if there are no more attributes */
+                nsIDOMElement_RemoveAttribute(child_elem, attr_str);
+
+            nsAString_Finish(&tag_str);
+
+            remove_child_attr(child_elem, tag, attr_str);
+
+            nsIDOMNode_Release(child_elem);
+        }
+
+        nsIDOMNode_Release(child_node);
+    }
+
+    nsIDOMNodeList_Release(node_list);
+}
+
+void get_font_size(HTMLDocument *This, WCHAR *ret)
+{
+    nsISelection *nsselection = get_ns_selection(This);
+    nsIDOMElement *elem = NULL;
+    nsIDOMNode *node = NULL, *tmp_node;
+    nsAString tag_str;
+    LPCWSTR tag;
+    PRUint16 node_type;
+    nsresult nsres;
+
+    *ret = 0;
+
+    if(!nsselection)
+        return;
+
+    nsISelection_GetFocusNode(nsselection, &node);
+    nsISelection_Release(nsselection);
+
+    while(node) {
+        nsres = nsIDOMNode_GetNodeType(node, &node_type);
+        if(NS_FAILED(nsres) || node_type == DOCUMENT_NODE)
+            break;
+
+        if(node_type == ELEMENT_NODE) {
+            nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem);
+
+            nsAString_Init(&tag_str, NULL);
+            nsIDOMElement_GetTagName(elem, &tag_str);
+            nsAString_GetData(&tag_str, &tag, NULL);
+
+            if(!strcmpiW(tag, wszFont)) {
+                nsAString size_str, val_str;
+                LPCWSTR val;
+
+                TRACE("found font tag %p", elem);
+
+                nsAString_Init(&size_str, wszSize);
+                nsAString_Init(&val_str, NULL);
+
+                nsIDOMElement_GetAttribute(elem, &size_str, &val_str);
+                nsAString_GetData(&val_str, &val, NULL);
+
+                if(*val) {
+                    TRACE("found size %s\n", debugstr_w(val));
+                    strcpyW(ret, val);
+                }
+
+                nsAString_Finish(&size_str);
+                nsAString_Finish(&val_str);
+            }
+
+            nsAString_Finish(&tag_str);
+
+            nsIDOMElement_Release(elem);
+        }
+
+        if(*ret)
+            break;
+
+        tmp_node = node;
+        nsIDOMNode_GetParentNode(node, &node);
+        nsIDOMNode_Release(tmp_node);
+    }
+
+    if(node)
+        nsIDOMNode_Release(node);
+}
+
+void set_font_size(HTMLDocument *This, LPCWSTR size)
+{
+    nsISelection *nsselection;
+    PRBool collapsed;
+    nsIDOMDocument *nsdoc;
+    nsIDOMElement *elem;
+    nsIDOMRange *range;
+    PRInt32 range_cnt = 0;
+    nsAString font_str;
+    nsAString size_str;
+    nsAString val_str;
+    nsresult nsres;
+
+    nsselection = get_ns_selection(This);
+
+    if(!nsselection)
+        return;
+
+    nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc);
+    if(NS_FAILED(nsres))
+        return;
+
+    nsAString_Init(&font_str, wszFont);
+    nsAString_Init(&size_str, wszSize);
+    nsAString_Init(&val_str, size);
+
+    nsISelection_GetRangeCount(nsselection, &range_cnt);
+    if(range_cnt != 1)
+        FIXME("range_cnt %d not supprted\n", range_cnt);
+
+    nsIDOMDocument_CreateElement(nsdoc, &font_str, &elem);
+    nsIDOMElement_SetAttribute(elem, &size_str, &val_str);        
+
+    nsISelection_GetRangeAt(nsselection, 0, &range);
+    nsISelection_GetIsCollapsed(nsselection, &collapsed);
+    nsISelection_RemoveAllRanges(nsselection);
+
+    nsIDOMRange_SurroundContents(range, (nsIDOMNode*)elem);
+
+    if(collapsed) {
+        nsISelection_Collapse(nsselection, (nsIDOMNode*)elem, 0);
+    }else {
+        /* Remove all size attrbutes from the range */
+        remove_child_attr(elem, wszFont, &size_str);
+        nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)elem);
+    }
+
+    nsIDOMRange_Release(range);
+    nsIDOMElement_Release(elem);
+
+    nsAString_Finish(&font_str);
+    nsAString_Finish(&size_str);
+    nsAString_Finish(&val_str);
+
+    nsISelection_Release(nsselection);
+    nsIDOMDocument_Release(nsdoc);
+}

dlls/mshtml/mshtml_private.h

@@ -350,6 +350,10 @@ void release_nodes(HTMLDocument*);
 
 void install_wine_gecko(void);
 
+/* editor */
+void get_font_size(HTMLDocument*,WCHAR*);
+void set_font_size(HTMLDocument*,LPCWSTR);
+
 extern DWORD mshtml_tls;
 
 typedef struct task_t {

dlls/mshtml/nsiface.idl

@@ -105,7 +105,6 @@ typedef nsISupports nsIDOMEntityReference;
 typedef nsISupports nsIDOMHTMLFormElement;
 typedef nsISupports nsIDOMHTMLOptionsCollection;
 typedef nsISupports nsIDOMHTMLCollection;
-typedef nsISupports nsIDOMRange;
 typedef nsISupports nsIEditor;
 typedef nsISupports nsIWebProgressListener;
 typedef nsISupports nsIDOMCSSValue;
@@ -617,6 +616,38 @@ interface nsIDOMHTMLDocument : nsIDOMDocument
 
 [
     object,
+    uuid(a6cf90ce-15b3-11d2-932e-00805f8add32)
+]
+interface nsIDOMRange : nsISupports
+{
+    nsresult GetStartContainer(nsIDOMNode **aStartContainer);
+    nsresult GetStartOffset(PRInt32 *aStartOffset);
+    nsresult GetEndContainer(nsIDOMNode **aEndContainer);
+    nsresult GetEndOffset(PRInt32 *aEndOffset);
+    nsresult GetCollapsed(PRBool *aCollapsed);
+    nsresult GetCommonAncestorContainer(nsIDOMNode **aCommonAncestorContainer);
+    nsresult SetStart(nsIDOMNode *refNode, PRInt32 offset);
+    nsresult SetEnd(nsIDOMNode *refNode, PRInt32 offset);
+    nsresult SetStartBefore(nsIDOMNode *refNode);
+    nsresult SetStartAfter(nsIDOMNode *refNode);
+    nsresult SetEndBefore(nsIDOMNode *refNode);
+    nsresult SetEndAfter(nsIDOMNode *refNode);
+    nsresult Collapse(PRBool toStart);
+    nsresult SelectNode(nsIDOMNode *refNode);
+    nsresult SelectNodeContents(nsIDOMNode *refNode);
+    nsresult CompareBoundaryPoints(PRUint16 how, nsIDOMRange *sourceRange, PRInt16 *_retval);
+    nsresult DeleteContents();
+    nsresult ExtractContents(nsIDOMDocumentFragment **_retval);
+    nsresult CloneContents(nsIDOMDocumentFragment **_retval);
+    nsresult InsertNode(nsIDOMNode *newNode);
+    nsresult SurroundContents(nsIDOMNode *newParent);
+    nsresult CloneRange(nsIDOMRange **_retval);
+    nsresult ToString(nsAString *_retval);
+    nsresult Detach();
+}
+
+[
+    object,
     uuid(b2c7ed59-8634-4352-9e37-5484c8b6e4e1)
 ]
 interface nsISelection : nsISupports

dlls/mshtml/olecmd.c

@@ -34,6 +34,7 @@
 #include "mshtmcid.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 #include "mshtml_private.h"
 
@@ -464,8 +465,43 @@ static HRESULT exec_forecolor(HTMLDocument *This, VARIANT *in, VARIANT *out)
 
 static HRESULT exec_fontsize(HTMLDocument *This, VARIANT *in, VARIANT *out)
 {
-    FIXME("(%p)->(%p %p)\n", This, in, out);
-    return E_NOTIMPL;
+    TRACE("(%p)->(%p %p)\n", This, in, out);
+
+    if(out) {
+        WCHAR val[10] = {0};
+
+        switch(V_VT(out)) {
+        case VT_I4:
+            get_font_size(This, val);
+            V_I4(out) = strtolW(val, NULL, 10);
+            break;
+        case VT_BSTR:
+            get_font_size(This, val);
+            V_BSTR(out) = SysAllocString(val);
+            break;
+        default:
+            FIXME("unsupported vt %d\n", V_VT(out));
+        }
+    }
+
+    if(in) {
+        switch(V_VT(in)) {
+        case VT_I4: {
+            WCHAR size[10];
+            static const WCHAR format[] = {'%','d',0};
+            wsprintfW(size, format, V_I4(in));
+            set_font_size(This, size);
+            break;
+        }
+        case VT_BSTR:
+            set_font_size(This, V_BSTR(in));
+            break;
+        default:
+            FIXME("unsupported vt %d\n", V_VT(out));
+        }
+    }
+
+    return S_OK;
 }
 
 static HRESULT exec_bold(HTMLDocument *This)