Piotr Caban : jscript: Make String_toLowerCase generic.
Alexandre Julliard
julliard at winehq.org
Mon Jul 13 07:57:00 CDT 2009
Module: wine
Branch: master
Commit: ab8168141be96ba168a347e1244460691ec637bb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8168141be96ba168a347e1244460691ec637bb
Author: Piotr Caban <piotr.caban at gmail.com>
Date: Sun Jul 12 19:52:02 2009 +0200
jscript: Make String_toLowerCase generic.
---
dlls/jscript/string.c | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index dcb0266..b33eb4f 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -1342,33 +1342,46 @@ static HRESULT String_sup(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS
static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{
- StringInstance *string;
const WCHAR* str;
DWORD length;
- BSTR bstr;
+ BSTR val_str = NULL;
+ HRESULT hres;
TRACE("\n");
- if(is_class(dispex, JSCLASS_STRING)) {
- string = (StringInstance*)dispex;
+ if(!is_class(dispex, JSCLASS_STRING)) {
+ VARIANT this;
- length = string->length;
- str = string->str;
- }else {
- FIXME("not string this not supported\n");
- 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;
}
if(retv) {
- bstr = SysAllocStringLen(str, length);
- if (!bstr)
- return E_OUTOFMEMORY;
+ if(!val_str) {
+ val_str = SysAllocStringLen(str, length);
+ if(!val_str)
+ return E_OUTOFMEMORY;
+ }
- strlwrW(bstr);
+ strlwrW(val_str);
V_VT(retv) = VT_BSTR;
- V_BSTR(retv) = bstr;
+ V_BSTR(retv) = val_str;
}
+ else SysFreeString(val_str);
return S_OK;
}
More information about the wine-cvs
mailing list