June 2007 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Move justify queries to command table.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: ca82a1eb0ed3ce103bae2d52474e7828b28fa49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca82a1eb0ed3ce103bae2d524… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:32:27 2007 +0200 mshtml: Move justify queries to command table. --- dlls/mshtml/editor.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/olecmd.c | 32 -------------------------------- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 2b2596a..6bdc0a0 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -136,6 +136,29 @@ static void set_ns_align(HTMLDocument *This, const char *align_str) nsICommandParams_Release(nsparam); } + +static DWORD query_align_status(HTMLDocument *This, const char *align_str) +{ + nsICommandParams *nsparam; + char *align = NULL; + + if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + return OLECMDF_SUPPORTED; + + if(This->nscontainer) { + nsparam = create_nscommand_params(); + get_ns_command_state(This->nscontainer, NSCMD_ALIGN, nsparam); + + nsICommandParams_GetCStringValue(nsparam, NSSTATE_ATTRIBUTE, &align); + + nsICommandParams_Release(nsparam); + } + + return OLECMDF_SUPPORTED | OLECMDF_ENABLED + | (align && !strcmp(align_str, align) ? OLECMDF_LATCHED : 0); +} + + static nsISelection *get_ns_selection(HTMLDocument *This) { nsIDOMWindow *dom_window; @@ -685,6 +708,26 @@ static HRESULT exec_italic(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VA return S_OK; } +static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd) +{ + switch(cmd->cmdID) { + case IDM_JUSTIFYCENTER: + TRACE("(%p) IDM_JUSTIFYCENTER\n", This); + cmd->cmdf = query_align_status(This, NSALIGN_CENTER); + break; + case IDM_JUSTIFYLEFT: + TRACE("(%p) IDM_JUSTIFYLEFT\n", This); + cmd->cmdf = query_align_status(This, NSALIGN_LEFT); + break; + case IDM_JUSTIFYRIGHT: + TRACE("(%p) IDM_JUSTIFYRIGHT\n", This); + cmd->cmdf = query_align_status(This, NSALIGN_RIGHT); + break; + } + + return S_OK; +} + static HRESULT exec_justifycenter(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { TRACE("(%p)\n", This); @@ -810,9 +853,9 @@ const cmdtable_t editmode_cmds[] = { {IDM_FORECOLOR, NULL, exec_forecolor}, {IDM_BOLD, NULL, exec_bold}, {IDM_ITALIC, NULL, exec_italic}, - {IDM_JUSTIFYCENTER, NULL, exec_justifycenter}, - {IDM_JUSTIFYRIGHT, NULL, exec_justifyright}, - {IDM_JUSTIFYLEFT, NULL, exec_justifyleft}, + {IDM_JUSTIFYCENTER, query_justify, exec_justifycenter}, + {IDM_JUSTIFYRIGHT, query_justify, exec_justifyright}, + {IDM_JUSTIFYLEFT, query_justify, exec_justifyleft}, {IDM_UNDERLINE, NULL, exec_underline}, {IDM_HORIZONTALLINE, NULL, exec_horizontalline}, {IDM_ORDERLIST, NULL, exec_orderlist}, diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index e78d038..df346eb 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -510,26 +510,6 @@ static DWORD query_edit_status(HTMLDocument *This, const char *nscmd) return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0); } -static DWORD query_align_status(HTMLDocument *This, const char *align_str) -{ - nsICommandParams *nsparam; - char *align = NULL; - - if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) - return OLECMDF_SUPPORTED; - - if(This->nscontainer) { - nsparam = create_nscommand_params(); - get_ns_command_state(This->nscontainer, NSCMD_ALIGN, nsparam); - - nsICommandParams_GetCStringValue(nsparam, NSSTATE_ATTRIBUTE, &align); - - nsICommandParams_Release(nsparam); - } - - return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (align && !strcmp(align_str, align) ? OLECMDF_LATCHED : 0); -} - static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) { FIXME("(%p)\n", This); @@ -861,18 +841,6 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con TRACE("CGID_MSHTML: IDM_ITALIC\n"); prgCmds[i].cmdf = query_edit_status(This, NSCMD_ITALIC); break; - case IDM_JUSTIFYCENTER: - TRACE("CGID_MSHTML: IDM_JUSTIFYCENTER\n"); - prgCmds[i].cmdf = query_align_status(This, NSALIGN_CENTER); - break; - case IDM_JUSTIFYLEFT: - TRACE("CGID_MSHTML: IDM_JUSTIFYLEFT\n"); - prgCmds[i].cmdf = query_align_status(This, NSALIGN_LEFT); - break; - case IDM_JUSTIFYRIGHT: - TRACE("CGID_MSHTML: IDM_JUSTIFYRIGHT\n"); - prgCmds[i].cmdf = query_align_status(This, NSALIGN_RIGHT); - break; case IDM_UNDERLINE: TRACE("CGID_MSHTML: IDM_UNDERLINE\n"); prgCmds[i].cmdf = query_edit_status(This, NSCMD_UNDERLINE);

1 0

Jacek Caban : mshtml: Use command table for IDM_COPY, IDM_CUT and IDM_PASTE query.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 7d336240d47740ee568451adb717a32080af0d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d336240d47740ee568451adb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:31:50 2007 +0200 mshtml: Use command table for IDM_COPY, IDM_CUT and IDM_PASTE query. --- dlls/mshtml/olecmd.c | 59 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index edb02c5..e78d038 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -530,6 +530,12 @@ static DWORD query_align_status(HTMLDocument *This, const char *align_str) return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (align && !strcmp(align_str, align) ? OLECMDF_LATCHED : 0); } +static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) +{ + FIXME("(%p)\n", This); + cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + return S_OK; +} static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { @@ -537,12 +543,26 @@ static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *i return E_NOTIMPL; } +static HRESULT query_mshtml_cut(HTMLDocument *This, OLECMD *cmd) +{ + FIXME("(%p)\n", This); + cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + return S_OK; +} + static HRESULT exec_mshtml_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); return E_NOTIMPL; } +static HRESULT query_mshtml_paste(HTMLDocument *This, OLECMD *cmd) +{ + FIXME("(%p)\n", This); + cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + return S_OK; +} + static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); @@ -715,9 +735,9 @@ static const struct { }; static const cmdtable_t base_cmds[] = { - {IDM_COPY, NULL, exec_mshtml_copy}, - {IDM_PASTE, NULL, exec_mshtml_paste}, - {IDM_CUT, NULL, exec_mshtml_cut}, + {IDM_COPY, query_mshtml_copy, exec_mshtml_copy}, + {IDM_PASTE, query_mshtml_paste, exec_mshtml_paste}, + {IDM_CUT, query_mshtml_cut, exec_mshtml_cut}, {IDM_BROWSEMODE, NULL, exec_browsemode}, {IDM_EDITMODE, NULL, exec_editmode}, {IDM_PRINT, NULL, exec_print}, @@ -745,6 +765,21 @@ static ULONG WINAPI OleCommandTarget_Release(IOleCommandTarget *iface) return IHTMLDocument_Release(HTMLDOC(This)); } +static HRESULT query_from_table(HTMLDocument *This, const cmdtable_t *cmdtable, OLECMD *cmd) +{ + const cmdtable_t *iter = cmdtable; + + cmd->cmdf = 0; + + while(iter->id && iter->id != cmd->cmdID) + iter++; + + if(!iter->id || !iter->query) + return OLECMDERR_E_NOTSUPPORTED; + + return iter->query(This, cmd); +} + static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { @@ -795,15 +830,13 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con ULONG i; for(i=0; i<cCmds; i++) { + HRESULT hres = query_from_table(This, base_cmds, prgCmds+i); + if(hres == OLECMDERR_E_NOTSUPPORTED) + hres = query_from_table(This, editmode_cmds, prgCmds+i); + if(hres != OLECMDERR_E_NOTSUPPORTED) + continue; + switch(prgCmds[i].cmdID) { - case IDM_COPY: - FIXME("CGID_MSHTML: IDM_COPY\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; - break; - case IDM_CUT: - FIXME("CGID_MSHTML: IDM_CUT\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; - break; case IDM_FONTNAME: TRACE("CGID_MSHTML: IDM_FONTNAME\n"); prgCmds[i].cmdf = query_edit_status(This, NULL); @@ -816,10 +849,6 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con FIXME("CGID_MSHTML: IDM_PRINT\n"); prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; - case IDM_PASTE: - FIXME("CGID_MSHTML: IDM_PASTE\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; - break; case IDM_BOLD: TRACE("CGID_MSHTML: IDM_BOLD\n"); prgCmds[i].cmdf = query_edit_status(This, NSCMD_BOLD);

1 0

Jacek Caban : mshtml: Move edit command queries to the command table.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 2e12e7e4de95b2b992bd52ac2eb3bb39128c2a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e12e7e4de95b2b992bd52ac2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:33:09 2007 +0200 mshtml: Move edit command queries to the command table. --- dlls/mshtml/editor.c | 103 ++++++++++++++++++++++++++++++++++++++++++------- dlls/mshtml/olecmd.c | 94 --------------------------------------------- 2 files changed, 88 insertions(+), 109 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6bdc0a0..b3ef0cb 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -50,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_UNDERLINE "cmd_underline" #define NSSTATE_ATTRIBUTE "state_attribute" +#define NSSTATE_ALL "state_all" #define NSALIGN_CENTER "center" #define NSALIGN_LEFT "left" @@ -122,6 +123,26 @@ static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsIComm return nsres; } +static DWORD query_ns_edit_status(HTMLDocument *This, const char *nscmd) +{ + nsICommandParams *nsparam; + PRBool b = FALSE; + + if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + return OLECMDF_SUPPORTED; + + if(This->nscontainer && nscmd) { + nsparam = create_nscommand_params(); + get_ns_command_state(This->nscontainer, nscmd, nsparam); + + nsICommandParams_GetBooleanValue(nsparam, NSSTATE_ALL, &b); + + nsICommandParams_Release(nsparam); + } + + return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0); +} + static void set_ns_align(HTMLDocument *This, const char *align_str) { nsICommandParams *nsparam; @@ -847,21 +868,73 @@ static HRESULT exec_composesettings(HTMLDocument *This, DWORD cmdexecopt, VARIAN return S_OK; } +static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) +{ + switch(cmd->cmdID) { + case IDM_FONTNAME: + TRACE("CGID_MSHTML: IDM_FONTNAME\n"); + cmd->cmdf = query_ns_edit_status(This, NULL); + break; + case IDM_FONTSIZE: + TRACE("CGID_MSHTML: IDM_FONTSIZE\n"); + cmd->cmdf = query_ns_edit_status(This, NULL); + break; + case IDM_BOLD: + TRACE("CGID_MSHTML: IDM_BOLD\n"); + cmd->cmdf = query_ns_edit_status(This, NSCMD_BOLD); + break; + case IDM_FORECOLOR: + TRACE("CGID_MSHTML: IDM_FORECOLOR\n"); + cmd->cmdf = query_ns_edit_status(This, NULL); + break; + case IDM_ITALIC: + TRACE("CGID_MSHTML: IDM_ITALIC\n"); + cmd->cmdf = query_ns_edit_status(This, NSCMD_ITALIC); + break; + case IDM_UNDERLINE: + TRACE("CGID_MSHTML: IDM_UNDERLINE\n"); + cmd->cmdf = query_ns_edit_status(This, NSCMD_UNDERLINE); + break; + case IDM_HORIZONTALLINE: + TRACE("CGID_MSHTML: IDM_HORIZONTALLINE\n"); + cmd->cmdf = query_ns_edit_status(This, NULL); + break; + case IDM_ORDERLIST: + TRACE("CGID_MSHTML: IDM_ORDERLIST\n"); + cmd->cmdf = query_ns_edit_status(This, NSCMD_OL); + break; + case IDM_UNORDERLIST: + TRACE("CGID_MSHTML: IDM_HORIZONTALLINE\n"); + cmd->cmdf = query_ns_edit_status(This, NSCMD_UL); + break; + case IDM_INDENT: + TRACE("CGID_MSHTML: IDM_INDENT\n"); + cmd->cmdf = query_ns_edit_status(This, NULL); + break; + case IDM_OUTDENT: + TRACE("CGID_MSHTML: IDM_OUTDENT\n"); + cmd->cmdf = query_ns_edit_status(This, NULL); + break; + } + + return S_OK; +} + const cmdtable_t editmode_cmds[] = { - {IDM_FONTNAME, NULL, exec_fontname}, - {IDM_FONTSIZE, NULL, exec_fontsize}, - {IDM_FORECOLOR, NULL, exec_forecolor}, - {IDM_BOLD, NULL, exec_bold}, - {IDM_ITALIC, NULL, exec_italic}, - {IDM_JUSTIFYCENTER, query_justify, exec_justifycenter}, - {IDM_JUSTIFYRIGHT, query_justify, exec_justifyright}, - {IDM_JUSTIFYLEFT, query_justify, exec_justifyleft}, - {IDM_UNDERLINE, NULL, exec_underline}, - {IDM_HORIZONTALLINE, NULL, exec_horizontalline}, - {IDM_ORDERLIST, NULL, exec_orderlist}, - {IDM_UNORDERLIST, NULL, exec_unorderlist}, - {IDM_INDENT, NULL, exec_indent}, - {IDM_OUTDENT, NULL, exec_outdent}, - {IDM_COMPOSESETTINGS, NULL, exec_composesettings}, + {IDM_FONTNAME, query_edit_status, exec_fontname}, + {IDM_FONTSIZE, query_edit_status, exec_fontsize}, + {IDM_FORECOLOR, query_edit_status, exec_forecolor}, + {IDM_BOLD, query_edit_status, exec_bold}, + {IDM_ITALIC, query_edit_status, exec_italic}, + {IDM_JUSTIFYCENTER, query_justify, exec_justifycenter}, + {IDM_JUSTIFYRIGHT, query_justify, exec_justifyright}, + {IDM_JUSTIFYLEFT, query_justify, exec_justifyleft}, + {IDM_UNDERLINE, query_edit_status, exec_underline}, + {IDM_HORIZONTALLINE, query_edit_status, exec_horizontalline}, + {IDM_ORDERLIST, query_edit_status, exec_orderlist}, + {IDM_UNORDERLIST, query_edit_status, exec_unorderlist}, + {IDM_INDENT, query_edit_status, exec_indent}, + {IDM_OUTDENT, query_edit_status, exec_outdent}, + {IDM_COMPOSESETTINGS, NULL, exec_composesettings}, {0,NULL,NULL} }; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index df346eb..b846588 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -52,7 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_OL "cmd_ol" #define NSSTATE_ATTRIBUTE "state_attribute" -#define NSSTATE_ALL "state_all" #define NSALIGN_CENTER "center" #define NSALIGN_LEFT "left" @@ -461,55 +460,6 @@ static HRESULT exec_get_print_template(HTMLDocument *This, DWORD nCmdexecopt, VA return E_NOTIMPL; } -static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsICommandParams *nsparam) -{ - nsICommandManager *cmdmgr; - nsIInterfaceRequestor *iface_req; - nsresult nsres; - - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return nsres; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsICommandManager, - (void**)&cmdmgr); - nsIInterfaceRequestor_Release(iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsICommandManager: %08x\n", nsres); - return nsres; - } - - nsres = nsICommandManager_GetCommandState(cmdmgr, cmd, NULL, nsparam); - if(NS_FAILED(nsres)) - ERR("GetCommandState(%s) failed: %08x\n", debugstr_a(cmd), nsres); - - nsICommandManager_Release(cmdmgr); - return nsres; -} - -static DWORD query_edit_status(HTMLDocument *This, const char *nscmd) -{ - nsICommandParams *nsparam; - PRBool b = FALSE; - - if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) - return OLECMDF_SUPPORTED; - - if(This->nscontainer && nscmd) { - nsparam = create_nscommand_params(); - get_ns_command_state(This->nscontainer, nscmd, nsparam); - - nsICommandParams_GetBooleanValue(nsparam, NSSTATE_ALL, &b); - - nsICommandParams_Release(nsparam); - } - - return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0); -} - static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) { FIXME("(%p)\n", This); @@ -817,54 +767,10 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con continue; switch(prgCmds[i].cmdID) { - case IDM_FONTNAME: - TRACE("CGID_MSHTML: IDM_FONTNAME\n"); - prgCmds[i].cmdf = query_edit_status(This, NULL); - break; - case IDM_FONTSIZE: - TRACE("CGID_MSHTML: IDM_FONTSIZE\n"); - prgCmds[i].cmdf = query_edit_status(This, NULL); - break; case IDM_PRINT: FIXME("CGID_MSHTML: IDM_PRINT\n"); prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; - case IDM_BOLD: - TRACE("CGID_MSHTML: IDM_BOLD\n"); - prgCmds[i].cmdf = query_edit_status(This, NSCMD_BOLD); - break; - case IDM_FORECOLOR: - TRACE("CGID_MSHTML: IDM_FORECOLOR\n"); - prgCmds[i].cmdf = query_edit_status(This, NULL); - break; - case IDM_ITALIC: - TRACE("CGID_MSHTML: IDM_ITALIC\n"); - prgCmds[i].cmdf = query_edit_status(This, NSCMD_ITALIC); - break; - case IDM_UNDERLINE: - TRACE("CGID_MSHTML: IDM_UNDERLINE\n"); - prgCmds[i].cmdf = query_edit_status(This, NSCMD_UNDERLINE); - break; - case IDM_HORIZONTALLINE: - TRACE("CGID_MSHTML: IDM_HORIZONTALLINE\n"); - prgCmds[i].cmdf = query_edit_status(This, NULL); - break; - case IDM_ORDERLIST: - 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"); - prgCmds[i].cmdf = query_edit_status(This, NSCMD_UL); - break; - case IDM_INDENT: - TRACE("CGID_MSHTML: IDM_INDENT\n"); - prgCmds[i].cmdf = query_edit_status(This, NULL); - break; - case IDM_OUTDENT: - TRACE("CGID_MSHTML: IDM_OUTDENT\n"); - prgCmds[i].cmdf = query_edit_status(This, NULL); - break; case IDM_BLOCKDIRLTR: FIXME("CGID_MSHTML: IDM_BLOCKDIRLTR\n"); prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED;

1 0

Jacek Caban : mshtml: Make [get|set]_font_size static.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: bd71f19ef12af08d6bb22abf0d96e0c8a77b2450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd71f19ef12af08d6bb22abf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:34:38 2007 +0200 mshtml: Make [get|set]_font_size static. --- dlls/mshtml/editor.c | 4 ++-- dlls/mshtml/mshtml_private.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index b3ef0cb..9b68c32 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -247,7 +247,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ nsIDOMNodeList_Release(node_list); } -void get_font_size(HTMLDocument *This, WCHAR *ret) +static void get_font_size(HTMLDocument *This, WCHAR *ret) { nsISelection *nsselection = get_ns_selection(This); nsIDOMElement *elem = NULL; @@ -315,7 +315,7 @@ void get_font_size(HTMLDocument *This, WCHAR *ret) nsIDOMNode_Release(node); } -void set_font_size(HTMLDocument *This, LPCWSTR size) +static void set_font_size(HTMLDocument *This, LPCWSTR size) { nsISelection *nsselection; PRBool collapsed; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5c2d689..5a0b17b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -385,9 +385,6 @@ extern const cmdtable_t editmode_cmds[]; /* editor */ void handle_edit_event(HTMLDocument*,nsIDOMEvent*); -void get_font_size(HTMLDocument*,WCHAR*); -void set_font_size(HTMLDocument*,LPCWSTR); - extern DWORD mshtml_tls; typedef struct task_t {

1 0

Jacek Caban : mshtml: Move more commands to editor command table.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: d42c2528833b66064a3c36e7cfe35b64df46ac73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d42c2528833b66064a3c36e7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:30:12 2007 +0200 mshtml: Move more commands to editor command table. --- dlls/mshtml/editor.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/olecmd.c | 89 --------------------------------------------- 2 files changed, 97 insertions(+), 90 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index d6bcf2a..4b455a0 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -37,11 +37,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define NSCMD_ALIGN "cmd_align" +#define NSCMD_BOLD "cmd_bold" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" +#define NSCMD_ITALIC "cmd_italic" +#define NSCMD_UNDERLINE "cmd_underline" #define NSSTATE_ATTRIBUTE "state_attribute" +#define NSALIGN_CENTER "center" +#define NSALIGN_LEFT "left" +#define NSALIGN_RIGHT "right" + #define DOM_VK_LEFT VK_LEFT #define DOM_VK_UP VK_UP #define DOM_VK_RIGHT VK_RIGHT @@ -109,6 +117,20 @@ static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsIComm return nsres; } +static void set_ns_align(HTMLDocument *This, const char *align_str) +{ + nsICommandParams *nsparam; + + if(!This->nscontainer) + return; + + nsparam = create_nscommand_params(); + nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, align_str); + + do_ns_command(This->nscontainer, NSCMD_ALIGN, nsparam); + + nsICommandParams_Release(nsparam); +} static nsISelection *get_ns_selection(HTMLDocument *This) { nsIDOMWindow *dom_window; @@ -275,7 +297,7 @@ void set_font_size(HTMLDocument *This, LPCWSTR size) FIXME("range_cnt %d not supprted\n", range_cnt); nsIDOMDocument_CreateElement(nsdoc, &font_str, &elem); - nsIDOMElement_SetAttribute(elem, &size_str, &val_str); + nsIDOMElement_SetAttribute(elem, &size_str, &val_str); nsISelection_GetRangeAt(nsselection, 0, &range); nsISelection_GetIsCollapsed(nsselection, &collapsed); @@ -632,9 +654,83 @@ static HRESULT exec_fontsize(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return S_OK; } +static HRESULT exec_bold(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_BOLD, NULL); + + return S_OK; +} + +static HRESULT exec_italic(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_ITALIC, NULL); + + return S_OK; +} + +static HRESULT exec_justifycenter(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + set_ns_align(This, NSALIGN_CENTER); + return S_OK; +} + +static HRESULT exec_justifyleft(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + set_ns_align(This, NSALIGN_LEFT); + return S_OK; +} + +static HRESULT exec_justifyright(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + set_ns_align(This, NSALIGN_RIGHT); + return S_OK; +} + +static HRESULT exec_underline(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_UNDERLINE, NULL); + + return S_OK; +} + const cmdtable_t editmode_cmds[] = { {IDM_FONTNAME, NULL, exec_fontname}, {IDM_FONTSIZE, NULL, exec_fontsize}, {IDM_FORECOLOR, NULL, exec_forecolor}, + {IDM_BOLD, NULL, exec_bold}, + {IDM_ITALIC, NULL, exec_italic}, + {IDM_JUSTIFYCENTER, NULL, exec_justifycenter}, + {IDM_JUSTIFYRIGHT, NULL, exec_justifyright}, + {IDM_JUSTIFYLEFT, NULL, exec_justifyleft}, + {IDM_UNDERLINE, NULL, exec_underline}, {0,NULL,NULL} }; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8ad7f40..966a103 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -560,20 +560,6 @@ static DWORD query_align_status(HTMLDocument *This, const char *align_str) return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (align && !strcmp(align_str, align) ? OLECMDF_LATCHED : 0); } -static void set_ns_align(HTMLDocument *This, const char *align_str) -{ - nsICommandParams *nsparam; - - if(!This->nscontainer) - return; - - nsparam = create_nscommand_params(); - nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, align_str); - - do_ns_command(This->nscontainer, NSCMD_ALIGN, nsparam); - - nsICommandParams_Release(nsparam); -} static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { @@ -593,57 +579,6 @@ static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT * return E_NOTIMPL; } -static HRESULT exec_bold(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - - if(This->nscontainer) - do_ns_command(This->nscontainer, NSCMD_BOLD, NULL); - - return S_OK; -} - -static HRESULT exec_italic(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - - if(This->nscontainer) - do_ns_command(This->nscontainer, NSCMD_ITALIC, NULL); - - return S_OK; -} - -static HRESULT exec_justifycenter(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - set_ns_align(This, NSALIGN_CENTER); - return S_OK; -} - -static HRESULT exec_justifyleft(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - set_ns_align(This, NSALIGN_LEFT); - return S_OK; -} - -static HRESULT exec_justifyright(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - set_ns_align(This, NSALIGN_RIGHT); - return S_OK; -} - -static HRESULT exec_underline(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - - if(This->nscontainer) - do_ns_command(This->nscontainer, NSCMD_UNDERLINE, NULL); - - return S_OK; -} - static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { WARN("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); @@ -1092,30 +1027,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return hres; switch(nCmdID) { - case IDM_BOLD: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_bold(This); - case IDM_ITALIC: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_italic(This); - case IDM_JUSTIFYCENTER: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_justifycenter(This); - case IDM_JUSTIFYLEFT: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_justifyleft(This); - case IDM_JUSTIFYRIGHT: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_justifyright(This); - case IDM_UNDERLINE: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_underline(This); case IDM_BASELINEFONT3: return exec_baselinefont3(This); case IDM_HORIZONTALLINE:

1 0

Jacek Caban : mshtml: Move more commands to command table.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 34f1f61acf42f1b49331b9228a77a36051ec2b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f1f61acf42f1b49331b9228… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:29:34 2007 +0200 mshtml: Move more commands to command table. --- dlls/mshtml/olecmd.c | 48 ++++++++++++++++-------------------------------- 1 files changed, 16 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 9ed66e0..8ad7f40 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -575,21 +575,21 @@ static void set_ns_align(HTMLDocument *This, const char *align_str) nsICommandParams_Release(nsparam); } -static HRESULT exec_mshtml_copy(HTMLDocument *This) +static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)\n", This); + FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); return E_NOTIMPL; } -static HRESULT exec_mshtml_cut(HTMLDocument *This) +static HRESULT exec_mshtml_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)\n", This); + FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); return E_NOTIMPL; } -static HRESULT exec_mshtml_paste(HTMLDocument *This) +static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)\n", This); + FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); return E_NOTIMPL; } @@ -802,9 +802,9 @@ static HRESULT exec_outdent(HTMLDocument *This) return S_OK; } -static HRESULT exec_htmleditmode(HTMLDocument *This, VARIANT *in) +static HRESULT exec_htmleditmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%p)\n", This, in); + FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); return S_OK; } @@ -820,9 +820,9 @@ static HRESULT exec_composesettings(HTMLDocument *This, VARIANT *in) return S_OK; } -static HRESULT exec_setdirty(HTMLDocument *This, VARIANT *in) +static HRESULT exec_setdirty(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%p)\n", This, in); + FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); return E_NOTIMPL; } @@ -872,8 +872,14 @@ static const struct { }; static const cmdtable_t base_cmds[] = { + {IDM_COPY, NULL, exec_mshtml_copy}, + {IDM_PASTE, NULL, exec_mshtml_paste}, + {IDM_CUT, NULL, exec_mshtml_cut}, {IDM_BROWSEMODE, NULL, exec_browsemode}, {IDM_EDITMODE, NULL, exec_editmode}, + {IDM_PRINT, NULL, exec_print}, + {IDM_SETDIRTY, NULL, exec_setdirty}, + {IDM_HTMLEDITMODE, NULL, exec_htmleditmode}, {0,NULL,NULL} }; @@ -1086,20 +1092,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return hres; switch(nCmdID) { - case IDM_COPY: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_mshtml_copy(This); - case IDM_CUT: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_mshtml_cut(This); - case IDM_PASTE: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_mshtml_paste(This); - case IDM_PRINT: - return exec_print(This, nCmdexecopt, pvaIn, pvaOut); case IDM_BOLD: if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); @@ -1146,18 +1138,10 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); return exec_outdent(This); - case IDM_HTMLEDITMODE: - if(pvaOut) - FIXME("unsupported arguments\n"); - return exec_htmleditmode(This, pvaIn); case IDM_COMPOSESETTINGS: if(pvaOut) FIXME("unsupported arguments\n"); return exec_composesettings(This, pvaIn); - case IDM_SETDIRTY: - if(pvaOut) - FIXME("unsupported arguments\n"); - return exec_setdirty(This, pvaIn); default: FIXME("unsupported nCmdID %d of CGID_MSHTML group\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED;

1 0

Jacek Caban : mshtml: Move IDM_FONTSIZE, IDM_FONTNAME and IDM_FORECOLOR to edit state command table.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 7a0e06b9e297311237ce18ca0df7b1bd756d47ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0e06b9e297311237ce18ca0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:28:52 2007 +0200 mshtml: Move IDM_FONTSIZE, IDM_FONTNAME and IDM_FORECOLOR to edit state command table. This patch temporary adds code duplication. --- dlls/mshtml/editor.c | 203 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/olecmd.c | 143 +----------------------------- 3 files changed, 208 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a0e06b9e297311237ce1…

1 0

Jacek Caban : mshtml: Added command table for CGID_MSHTML commands.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 510481b70cb2e8754459f0f541f9dc3c70345910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510481b70cb2e8754459f0f54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:26:47 2007 +0200 mshtml: Added command table for CGID_MSHTML commands. --- dlls/mshtml/mshtml_private.h | 6 +++++ dlls/mshtml/olecmd.c | 47 +++++++++++++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 39e4533..179378e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -374,6 +374,12 @@ void release_nodes(HTMLDocument*); BOOL install_wine_gecko(void); +typedef struct { + DWORD id; + HRESULT (*query)(HTMLDocument*,OLECMD*); + HRESULT (*exec)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); +} cmdtable_t; + /* editor */ void handle_edit_event(HTMLDocument*,nsIDOMEvent*); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a309e9d..767540e 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -777,9 +777,12 @@ static HRESULT exec_underline(HTMLDocument *This) return S_OK; } -static HRESULT exec_browsemode(HTMLDocument *This) +static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - WARN("(%p)\n", This); + WARN("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(in || out) + FIXME("unsupported args\n"); This->usermode = BROWSEMODE; @@ -834,14 +837,17 @@ static void setup_ns_editing(NSContainer *This) nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); } -static HRESULT exec_editmode(HTMLDocument *This) +static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { IMoniker *mon; HRESULT hres; static const WCHAR wszAboutBlank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - TRACE("(%p)\n", This); + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(in || out) + FIXME("unsupported args\n"); This->usermode = EDITMODE; @@ -998,6 +1004,12 @@ static const struct { { OLECMDF_SUPPORTED, exec_get_print_template } /* OLECMDID_GETPRINTTEMPLATE */ }; +static const cmdtable_t base_cmds[] = { + {IDM_BROWSEMODE, NULL, exec_browsemode}, + {IDM_EDITMODE, NULL, exec_editmode}, + {0,NULL,NULL} +}; + static HRESULT WINAPI OleCommandTarget_QueryInterface(IOleCommandTarget *iface, REFIID riid, void **ppv) { HTMLDocument *This = CMDTARGET_THIS(iface); @@ -1165,6 +1177,20 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con return hres; } +static HRESULT exec_from_table(HTMLDocument *This, const cmdtable_t *cmdtable, DWORD cmdid, + DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + const cmdtable_t *iter = cmdtable; + + while(iter->id && iter->id != cmdid) + iter++; + + if(!iter->id || !iter->exec) + return OLECMDERR_E_NOTSUPPORTED; + + return iter->exec(This, cmdexecopt, in, out); +} + static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { @@ -1185,6 +1211,11 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID FIXME("unsupported nCmdID %d of CGID_ShellDocView group\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED; }else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + HRESULT hres = exec_from_table(This, base_cmds, nCmdID, nCmdexecopt, pvaIn, pvaOut); + + if(hres != OLECMDERR_E_NOTSUPPORTED) + return hres; + switch(nCmdID) { case IDM_COPY: if(pvaIn || pvaOut) @@ -1230,14 +1261,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); return exec_underline(This); - case IDM_BROWSEMODE: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_browsemode(This); - case IDM_EDITMODE: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_editmode(This); case IDM_BASELINEFONT3: return exec_baselinefont3(This); case IDM_HORIZONTALLINE:

1 0

Jacek Caban : mshtml: Move remaining commands to tables.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: eb8b3417e08c1773dce88ca6f3e557b976d9d302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8b3417e08c1773dce88ca6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:31:04 2007 +0200 mshtml: Move remaining commands to tables. --- dlls/mshtml/editor.c | 88 +++++++++++++++++++++++++++++++ dlls/mshtml/olecmd.c | 139 +++---------------------------------------------- 2 files changed, 97 insertions(+), 130 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 4b455a0..2b2596a 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -41,7 +41,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_BOLD "cmd_bold" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" +#define NSCMD_INDENT "cmd_indent" +#define NSCMD_INSERTHR "cmd_insertHR" #define NSCMD_ITALIC "cmd_italic" +#define NSCMD_OL "cmd_ol" +#define NSCMD_OUTDENT "cmd_outdent" +#define NSCMD_UL "cmd_ul" #define NSCMD_UNDERLINE "cmd_underline" #define NSSTATE_ATTRIBUTE "state_attribute" @@ -722,6 +727,83 @@ static HRESULT exec_underline(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return S_OK; } +static HRESULT exec_horizontalline(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_INSERTHR, NULL); + + return S_OK; +} + +static HRESULT exec_orderlist(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_OL, NULL); + + return S_OK; +} + +static HRESULT exec_unorderlist(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_UL, NULL); + + return S_OK; +} + +static HRESULT exec_indent(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_INDENT, NULL); + + return S_OK; +} + +static HRESULT exec_outdent(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_OUTDENT, NULL); + + return S_OK; +} + +static HRESULT exec_composesettings(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + if(out || !in || V_VT(in) != VT_BSTR) { + WARN("invalid arg\n"); + return E_INVALIDARG; + } + + FIXME("%s\n", debugstr_w(V_BSTR(in))); + + return S_OK; +} + const cmdtable_t editmode_cmds[] = { {IDM_FONTNAME, NULL, exec_fontname}, {IDM_FONTSIZE, NULL, exec_fontsize}, @@ -732,5 +814,11 @@ const cmdtable_t editmode_cmds[] = { {IDM_JUSTIFYRIGHT, NULL, exec_justifyright}, {IDM_JUSTIFYLEFT, NULL, exec_justifyleft}, {IDM_UNDERLINE, NULL, exec_underline}, + {IDM_HORIZONTALLINE, NULL, exec_horizontalline}, + {IDM_ORDERLIST, NULL, exec_orderlist}, + {IDM_UNORDERLIST, NULL, exec_unorderlist}, + {IDM_INDENT, NULL, exec_indent}, + {IDM_OUTDENT, NULL, exec_outdent}, + {IDM_COMPOSESETTINGS, NULL, exec_composesettings}, {0,NULL,NULL} }; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 966a103..edb02c5 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -461,36 +461,6 @@ static HRESULT exec_get_print_template(HTMLDocument *This, DWORD nCmdexecopt, VA return E_NOTIMPL; } -static void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *nsparam) -{ - nsICommandManager *cmdmgr; - nsIInterfaceRequestor *iface_req; - nsresult nsres; - - TRACE("(%p)\n", This); - - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsICommandManager, - (void**)&cmdmgr); - nsIInterfaceRequestor_Release(iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsICommandManager: %08x\n", nsres); - return; - } - - nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, NULL); - if(NS_FAILED(nsres)) - ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres); - - nsICommandManager_Release(cmdmgr); -} - static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsICommandParams *nsparam) { nsICommandManager *cmdmgr; @@ -681,84 +651,22 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); } -static HRESULT exec_baselinefont3(HTMLDocument *This) -{ - FIXME("(%p)\n", This); - return S_OK; -} - -static HRESULT exec_horizontalline(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - - if(This->nscontainer) - do_ns_command(This->nscontainer, NSCMD_INSERTHR, NULL); - - 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); - - if(This->nscontainer) - do_ns_command(This->nscontainer, NSCMD_UL, NULL); - - return S_OK; -} - -static HRESULT exec_indent(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - - if(This->nscontainer) - do_ns_command(This->nscontainer, NSCMD_INDENT, NULL); - - return S_OK; -} - -static HRESULT exec_outdent(HTMLDocument *This) -{ - TRACE("(%p)\n", This); - - if(This->nscontainer) - do_ns_command(This->nscontainer, NSCMD_OUTDENT, NULL); - - return S_OK; -} - static HRESULT exec_htmleditmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); return S_OK; } -static HRESULT exec_composesettings(HTMLDocument *This, VARIANT *in) +static HRESULT exec_setdirty(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - if(!in || V_VT(in) != VT_BSTR) { - WARN("invalid arg\n"); - return E_INVALIDARG; - } - - FIXME("%s\n", debugstr_w(V_BSTR(in))); - - return S_OK; + FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + return E_NOTIMPL; } -static HRESULT exec_setdirty(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +static HRESULT exec_baselinefont3(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); - return E_NOTIMPL; + return S_OK; } static const struct { @@ -815,6 +723,7 @@ static const cmdtable_t base_cmds[] = { {IDM_PRINT, NULL, exec_print}, {IDM_SETDIRTY, NULL, exec_setdirty}, {IDM_HTMLEDITMODE, NULL, exec_htmleditmode}, + {IDM_BASELINEFONT3, NULL, exec_baselinefont3}, {0,NULL,NULL} }; @@ -1023,40 +932,10 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(hres == OLECMDERR_E_NOTSUPPORTED) hres = exec_from_table(This, editmode_cmds, nCmdID, nCmdexecopt, pvaIn, pvaOut); - if(hres != OLECMDERR_E_NOTSUPPORTED) - return hres; - - switch(nCmdID) { - case IDM_BASELINEFONT3: - return exec_baselinefont3(This); - case IDM_HORIZONTALLINE: - 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"); - return exec_unorderlist(This); - case IDM_INDENT: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_indent(This); - case IDM_OUTDENT: - if(pvaIn || pvaOut) - FIXME("unsupported arguments\n"); - return exec_outdent(This); - case IDM_COMPOSESETTINGS: - if(pvaOut) - FIXME("unsupported arguments\n"); - return exec_composesettings(This, pvaIn); - default: + if(hres == OLECMDERR_E_NOTSUPPORTED) FIXME("unsupported nCmdID %d of CGID_MSHTML group\n", nCmdID); - return OLECMDERR_E_NOTSUPPORTED; - } + + return hres; } FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup));

1 0

Alexandre Julliard : msxml: Don' t use VariantClear on an uninitialized variant.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 6d8c6c5a3ac709ff537f438414950c777e698fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8c6c5a3ac709ff537f43841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 15:00:11 2007 +0200 msxml: Don't use VariantClear on an uninitialized variant. --- dlls/msxml3/xmlelem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index b4fa1e7..cf2a21a 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -219,7 +219,7 @@ static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR strPropertyN if (!PropertyValue) return E_INVALIDARG; - VariantClear(PropertyValue); + VariantInit(PropertyValue); V_BSTR(PropertyValue) = NULL; if (!strPropertyName)

1 0