Piotr Caban : jscript: Change do_attributeless_tag_format so it works on non string objects.
Alexandre Julliard
julliard at winehq.org
Mon Jul 13 07:56:27 CDT 2009
Module: wine
Branch: master
Commit: 0ee06df4b06763297995a55d7e066fc2a27b1140
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee06df4b06763297995a55d7e066fc2a27b1140
Author: Piotr Caban <piotr.caban at gmail.com>
Date: Sun Jul 12 19:50:22 2009 +0200
jscript: Change do_attributeless_tag_format so it works on non string objects.
---
dlls/jscript/string.c | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index 70ec50b..56048fb 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -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)
{
static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0};
- StringInstance *string;
- BSTR ret;
+ const WCHAR *str;
+ DWORD length;
+ BSTR val_str = NULL;
+ HRESULT hres;
if(!is_class(dispex, JSCLASS_STRING)) {
- WARN("this is not a string object\n");
- return E_NOTIMPL;
+ VARIANT this;
+
+ 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;
- string = (StringInstance*)dispex;
+ str = this->str;
+ length = this->length;
+ }
if(retv) {
- ret = SysAllocStringLen(NULL, string->length + 2*strlenW(tagname) + 5);
- if(!ret)
+ BSTR ret = SysAllocStringLen(NULL, length + 2*strlenW(tagname) + 5);
+ if(!ret) {
+ SysFreeString(val_str);
return E_OUTOFMEMORY;
+ }
- sprintfW(ret, tagfmt, tagname, string->str, tagname);
+ sprintfW(ret, tagfmt, tagname, str, tagname);
V_VT(retv) = VT_BSTR;
V_BSTR(retv) = ret;
}
+
+ SysFreeString(val_str);
return S_OK;
}
More information about the wine-cvs
mailing list