Jacek Caban : mshtml: Added QueryStatus(IDM_FONTNAME) implementation.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Thu Nov  9 10:44:15 2006 +0100

mshtml: Added QueryStatus(IDM_FONTNAME) implementation.

---

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

diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index dfeb81d..01c98bb 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -310,7 +310,7 @@ static DWORD query_edit_status(HTMLDocum
     if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE)
         return OLECMDF_SUPPORTED;
 
-    if(This->nscontainer) {
+    if(This->nscontainer && nscmd) {
         nsparam = create_nscommand_params();
         get_ns_command_state(This->nscontainer, nscmd, nsparam);
 
@@ -636,8 +636,8 @@ static HRESULT WINAPI OleCommandTarget_Q
                 prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED;
                 break;
             case IDM_FONTNAME:
-                FIXME("CGID_MSHTML: IDM_FONTNAME\n");
-                prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED;
+                TRACE("CGID_MSHTML: IDM_FONTNAME\n");
+                prgCmds[i].cmdf = query_edit_status(This, NULL);
                 break;
             case IDM_FONTSIZE:
                 FIXME("CGID_MSHTML: IDM_FONTSIZE\n");
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 6b28b13..c643456 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -2039,6 +2039,7 @@ static void test_MSHTML_QueryStatus(IUnk
     if(unk) _unk = unk;
     else unk = _unk;
 
+    test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf);
     test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf);
     test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf);
     test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf);