Jacek Caban : mshtml: Added IDM_ORDERLIST implementation.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Nov 13 06:30:16 CST 2006


Module: wine
Branch: master
Commit: 2a782684300b59955cd39f1eb5e06565b55b92cd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a782684300b59955cd39f1eb5e06565b55b92cd

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Sat Nov 11 15:32:49 2006 +0100

mshtml: Added IDM_ORDERLIST implementation.

---

 dlls/mshtml/olecmd.c        |   19 +++++++++++++++++--
 dlls/mshtml/tests/htmldoc.c |    1 +
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index 91ab10b..8714a6e 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -49,6 +49,7 @@ #define NSCMD_INDENT "cmd_indent"
 #define NSCMD_OUTDENT "cmd_outdent"
 #define NSCMD_INSERTHR "cmd_insertHR"
 #define NSCMD_UL "cmd_ul"
+#define NSCMD_OL "cmd_ol"
 
 #define NSSTATE_ATTRIBUTE "state_attribute"
 #define NSSTATE_ALL "state_all"
@@ -630,6 +631,16 @@ static HRESULT exec_horizontalline(HTMLD
     return S_OK;
 }
 
+static HRESULT exec_orderlist(HTMLDocument *This)
+{
+    TRACE("(%p)\n", This);
+
+    if(This->nscontainer)
+        do_ns_command(This->nscontainer, NSCMD_OL, NULL);
+
+    return S_OK;
+}
+
 static HRESULT exec_unorderlist(HTMLDocument *This)
 {
     TRACE("(%p)\n", This);
@@ -827,8 +838,8 @@ static HRESULT WINAPI OleCommandTarget_Q
                 prgCmds[i].cmdf = query_edit_status(This, NULL);
                 break;
             case IDM_ORDERLIST:
-                FIXME("CGID_MSHTML: IDM_ORDERLIST\n");
-                prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED;
+                TRACE("CGID_MSHTML: IDM_ORDERLIST\n");
+                prgCmds[i].cmdf = query_edit_status(This, NSCMD_OL);
                 break;
             case IDM_UNORDERLIST:
                 TRACE("CGID_MSHTML: IDM_HORIZONTALLINE\n");
@@ -933,6 +944,10 @@ static HRESULT WINAPI OleCommandTarget_E
             if(pvaIn || pvaOut)
                 FIXME("unsupported arguments\n");
             return exec_horizontalline(This);
+        case IDM_ORDERLIST:
+            if(pvaIn || pvaOut)
+                FIXME("unsupported arguments\n");
+            return exec_orderlist(This);
         case IDM_UNORDERLIST:
             if(pvaIn || pvaOut)
                 FIXME("unsupported arguments\n");
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 26c938b..21bec06 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -2049,6 +2049,7 @@ static void test_MSHTML_QueryStatus(IUnk
     test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf);
     test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf);
     test_QueryStatus(unk, &CGID_MSHTML, IDM_HORIZONTALLINE, cmdf);
+    test_QueryStatus(unk, &CGID_MSHTML, IDM_ORDERLIST, cmdf);
     test_QueryStatus(unk, &CGID_MSHTML, IDM_UNORDERLIST, cmdf);
     test_QueryStatus(unk, &CGID_MSHTML, IDM_INDENT, cmdf);
     test_QueryStatus(unk, &CGID_MSHTML, IDM_OUTDENT, cmdf);




More information about the wine-cvs mailing list