Jacek Caban : mshtml: Use get_nsinterface in exec_print and do_ns_command.
Alexandre Julliard
julliard at winehq.org
Thu Sep 27 09:27:26 CDT 2007
Module: wine
Branch: master
Commit: cf403fa484f7ff7166ac0091ee607c18f17bdc71
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf403fa484f7ff7166ac0091ee607c18f17bdc71
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 26 20:46:14 2007 +0200
mshtml: Use get_nsinterface in exec_print and do_ns_command.
---
dlls/mshtml/olecmd.c | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index 458209c..595107a 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -61,21 +61,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
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);
+ nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsICommandManager, (void**)&cmdmgr);
if(NS_FAILED(nsres)) {
ERR("Could not get nsICommandManager: %08x\n", nsres);
return;
@@ -241,7 +231,6 @@ static void set_default_templates(nsIPrintSettings *settings)
static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- nsIInterfaceRequestor *iface_req;
nsIWebBrowserPrint *nsprint;
nsIPrintSettings *settings;
nsresult nsres;
@@ -254,16 +243,8 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn,
if(!This->nscontainer)
return S_OK;
- nsres = nsIWebBrowser_QueryInterface(This->nscontainer->webbrowser,
- &IID_nsIInterfaceRequestor, (void**)&iface_req);
- if(NS_FAILED(nsres)) {
- ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres);
- return S_OK;
- }
-
- nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIWebBrowserPrint,
+ nsres = get_nsinterface((nsISupports*)This->nscontainer->webbrowser, &IID_nsIWebBrowserPrint,
(void**)&nsprint);
- nsIInterfaceRequestor_Release(iface_req);
if(NS_FAILED(nsres)) {
ERR("Could not get nsIWebBrowserPrint: %08x\n", nsres);
return S_OK;
More information about the wine-cvs
mailing list