From ad8115fd2e2aee3ee1037862b5298220cbe9b90d Mon Sep 17 00:00:00 2001 From: Shuai Meng Date: Sun, 16 Mar 2014 11:25:27 +0800 Subject: [PATCH 10/11] vbscript: Fixed CStr. --- dlls/vbscript/global.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 8415450..dd65869 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -448,16 +448,11 @@ static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - BSTR str; - HRESULT hres; - TRACE("%s\n", debugstr_variant(arg)); + assert(args_cnt == 1); - hres = to_string(arg, &str); - if(FAILED(hres)) - return hres; - - return return_bstr(res, str); + V_VT(res) = VT_EMPTY; + return VariantChangeType(res, arg, VARIANT_LOCALBOOL, VT_BSTR); } static inline WCHAR hex_char(unsigned n) -- 1.8.1.2