Jacek Caban : mshtml: Code clean up.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 9 13:57:54 CST 2006
Module: wine
Branch: master
Commit: c64326e62c6f14233ca29a0ee8ee83596387e389
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64326e62c6f14233ca29a0ee8ee83596387e389
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 9 10:49:53 2006 +0100
mshtml: Code clean up.
---
dlls/mshtml/olecmd.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index ecb92e8..d663e48 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -44,8 +44,10 @@ #define NSCMD_ITALIC "cmd_italic"
#define NSCMD_UNDERLINE "cmd_underline"
#define NSCMD_FONTCOLOR "cmd_fontColor"
#define NSCMD_ALIGN "cmd_align"
+#define NSCMD_FONTFACE "cmd_fontFace"
#define NSSTATE_ATTRIBUTE "state_attribute"
+#define NSSTATE_ALL "state_all"
/**********************************************************
* IOleCommandTarget implementation
@@ -318,7 +320,7 @@ static DWORD query_edit_status(HTMLDocum
nsparam = create_nscommand_params();
get_ns_command_state(This->nscontainer, nscmd, nsparam);
- nsICommandParams_GetBooleanValue(nsparam, "state_all", &b);
+ nsICommandParams_GetBooleanValue(nsparam, NSSTATE_ALL, &b);
}
return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0);
@@ -359,10 +361,10 @@ static HRESULT exec_fontname(HTMLDocumen
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, "state_attribute", stra);
+ nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, stra);
mshtml_free(stra);
- do_ns_command(This->nscontainer, "cmd_fontFace", nsparam);
+ do_ns_command(This->nscontainer, NSCMD_FONTFACE, nsparam);
nsICommandParams_Release(nsparam);
}
@@ -381,11 +383,11 @@ static HRESULT exec_fontname(HTMLDocumen
nsparam = create_nscommand_params();
- nsres = get_ns_command_state(This->nscontainer, "cmd_fontFace", nsparam);
+ nsres = get_ns_command_state(This->nscontainer, NSCMD_FONTFACE, nsparam);
if(NS_FAILED(nsres))
return S_OK;
- nsICommandParams_GetCStringValue(nsparam, "state_attribute", &stra);
+ nsICommandParams_GetCStringValue(nsparam, NSSTATE_ATTRIBUTE, &stra);
nsICommandParams_Release(nsparam);
len = MultiByteToWideChar(CP_ACP, 0, stra, -1, NULL, 0);
More information about the wine-cvs
mailing list