ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added IDM_FORECOLOR implementation.

Browse Source
This commit is contained in:
Jacek Caban 2006-11-09 10:47:10 +01:00 committed by Alexandre Julliard
parent f0871b5814
commit 40d31d869b
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/mshtml/olecmd.c
View File

@ -42,6 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define NSCMD_BOLD "cmd_bold" #define NSCMD_BOLD "cmd_bold"
#define NSCMD_ITALIC "cmd_italic" #define NSCMD_ITALIC "cmd_italic"
#define NSCMD_UNDERLINE "cmd_underline" #define NSCMD_UNDERLINE "cmd_underline"
#define NSCMD_FONTCOLOR "cmd_fontColor"
#define NSSTATE_ATTRIBUTE "state_attribute"
/********************************************************** /**********************************************************
* IOleCommandTarget implementation * IOleCommandTarget implementation
@ -381,6 +384,35 @@ static HRESULT exec_fontname(HTMLDocument *This, VARIANT *in, VARIANT *out)
return S_OK; return S_OK;
} }
static HRESULT exec_forecolor(HTMLDocument *This, VARIANT *in, VARIANT *out)
{
TRACE("(%p)->(%p %p)\n", This, in, out);
if(in) {
if(V_VT(in) == VT_I4) {
nsICommandParams *nsparam = create_nscommand_params();
char color_str[10];
sprintf(color_str, "#%02x%02x%02x",
V_I4(in)&0xff, (V_I4(in)>>8)&0xff, (V_I4(in)>>16)&0xff);
nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, color_str);
do_ns_command(This->nscontainer, NSCMD_FONTCOLOR, nsparam);
nsICommandParams_Release(nsparam);
}else {
FIXME("unsupported in vt=%d\n", V_VT(in));
}
}
if(out) {
FIXME("unsupported out\n");
return E_NOTIMPL;
}
return S_OK;
}
static HRESULT exec_fontsize(HTMLDocument *This, VARIANT *in, VARIANT *out) static HRESULT exec_fontsize(HTMLDocument *This, VARIANT *in, VARIANT *out)
{ {
FIXME("(%p)->(%p %p)\n", This, in, out); FIXME("(%p)->(%p %p)\n", This, in, out);
@ -658,8 +690,8 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con
prgCmds[i].cmdf = query_edit_status(This, NSCMD_BOLD); prgCmds[i].cmdf = query_edit_status(This, NSCMD_BOLD);
break; break;
case IDM_FORECOLOR: case IDM_FORECOLOR:
FIXME("CGID_MSHTML: IDM_FORECOLOR\n"); TRACE("CGID_MSHTML: IDM_FORECOLOR\n");
prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; prgCmds[i].cmdf = query_edit_status(This, NULL);
break; break;
case IDM_ITALIC: case IDM_ITALIC:
TRACE("CGID_MSHTML: IDM_ITALIC\n"); TRACE("CGID_MSHTML: IDM_ITALIC\n");
@ -756,6 +788,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
if(pvaIn || pvaOut) if(pvaIn || pvaOut)
FIXME("unsupported arguments\n"); FIXME("unsupported arguments\n");
return exec_bold(This); return exec_bold(This);
case IDM_FORECOLOR:
return exec_forecolor(This, pvaIn, pvaOut);
case IDM_ITALIC: case IDM_ITALIC:
if(pvaIn || pvaOut) if(pvaIn || pvaOut)
FIXME("unsupported arguments\n"); FIXME("unsupported arguments\n");

1
dlls/mshtml/tests/htmldoc.c
View File

@ -2042,6 +2042,7 @@ static void test_MSHTML_QueryStatus(IUnknown *unk, DWORD cmdf)
test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf);
test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTSIZE, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTSIZE, cmdf);
test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf);
test_QueryStatus(unk, &CGID_MSHTML, IDM_FORECOLOR, cmdf);
test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf);
test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf);
} }