From 902a39f0bdcc8aefc78662ea6a039ed07f0ae4e5 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 14 Dec 2006 20:39:21 +0100 Subject: [PATCH] mshtml: Use pvaIn in exec_print. --- dlls/mshtml/olecmd.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8de5e0dad34..60518a17573 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -222,8 +222,6 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, if(pvaOut) FIXME("unsupported pvaOut\n"); - if(pvaIn) - FIXME("unsupported pvaIn\n"); if(!This->nscontainer) return S_OK; @@ -249,6 +247,55 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, set_default_templates(settings); + if(pvaIn) { + switch(V_VT(pvaIn)) { + case VT_BYREF|VT_ARRAY: { + VARIANT *opts; + DWORD opts_cnt; + + if(V_ARRAY(pvaIn)->cDims != 1) + WARN("cDims = %d\n", V_ARRAY(pvaIn)->cDims); + + SafeArrayAccessData(V_ARRAY(pvaIn), (void**)&opts); + opts_cnt = V_ARRAY(pvaIn)->rgsabound[0].cElements; + + if(opts_cnt >= 1) { + switch(V_VT(opts)) { + case VT_BSTR: + TRACE("setting footer %s\n", debugstr_w(V_BSTR(opts))); + set_print_template(settings, V_BSTR(opts), TRUE); + break; + case VT_NULL: + break; + default: + WARN("V_VT(opts) = %d\n", V_VT(opts)); + } + } + + if(opts_cnt >= 2) { + switch(V_VT(opts+1)) { + case VT_BSTR: + TRACE("setting footer %s\n", debugstr_w(V_BSTR(opts+1))); + set_print_template(settings, V_BSTR(opts+1), FALSE); + break; + case VT_NULL: + break; + default: + WARN("V_VT(opts) = %d\n", V_VT(opts+1)); + } + } + + if(opts_cnt >= 3) + FIXME("Unsuported opts_cnt %d\n", opts_cnt); + + SafeArrayUnaccessData(V_ARRAY(pvaIn)); + break; + } + default: + FIXME("unsupported vt %x\n", V_VT(pvaIn)); + } + } + nsres = nsIWebBrowserPrint_Print(nsprint, settings, NULL); if(NS_FAILED(nsres)) ERR("Print failed: %08x\n", nsres); -- 2.11.4.GIT