ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Change do_attributeless_tag_format so it works on non string objects.

This commit is contained in:
Piotr Caban 2009-07-12 19:50:22 +02:00 committed by Alexandre Julliard
parent 004eabfbd3
commit 0ee06df4b0
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/jscript/string.c
View File

@ -127,26 +127,45 @@ static HRESULT do_attributeless_tag_format(DispatchEx *dispex, LCID lcid, WORD f
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, const WCHAR *tagname) VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, const WCHAR *tagname)
{ {
static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0}; static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0};
StringInstance *string; const WCHAR *str;
BSTR ret; DWORD length;
BSTR val_str = NULL;
HRESULT hres;
if(!is_class(dispex, JSCLASS_STRING)) { if(!is_class(dispex, JSCLASS_STRING)) {
WARN("this is not a string object\n"); VARIANT this;
return E_NOTIMPL;
V_VT(&this) = VT_DISPATCH;
V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex);
hres = to_string(dispex->ctx, &this, ei, &val_str);
if(FAILED(hres))
return hres;
str = val_str;
length = SysStringLen(val_str);
}
else {
StringInstance *this = (StringInstance*)dispex;
str = this->str;
length = this->length;
} }
string = (StringInstance*)dispex;
if(retv) { if(retv) {
ret = SysAllocStringLen(NULL, string->length + 2*strlenW(tagname) + 5); BSTR ret = SysAllocStringLen(NULL, length + 2*strlenW(tagname) + 5);
if(!ret) if(!ret) {
SysFreeString(val_str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
}
sprintfW(ret, tagfmt, tagname, string->str, tagname); sprintfW(ret, tagfmt, tagname, str, tagname);
V_VT(retv) = VT_BSTR; V_VT(retv) = VT_BSTR;
V_BSTR(retv) = ret; V_BSTR(retv) = ret;
} }
SysFreeString(val_str);
return S_OK; return S_OK;
} }