Piotr Caban : jscript: Fix DateConstr_parse implementation.
Alexandre Julliard
julliard at winehq.org
Tue Jul 7 08:08:23 CDT 2009
Module: wine
Branch: master
Commit: 12760a0c6b02888c085fef7a38f7ecec0cdf3ecd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=12760a0c6b02888c085fef7a38f7ecec0cdf3ecd
Author: Piotr Caban <piotr.caban at gmail.com>
Date: Tue Jul 7 13:44:53 2009 +0200
jscript: Fix DateConstr_parse implementation.
---
dlls/jscript/date.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c
index 525a3a2..3a681b9 100644
--- a/dlls/jscript/date.c
+++ b/dlls/jscript/date.c
@@ -2492,7 +2492,7 @@ static inline HRESULT date_parse(BSTR input, VARIANT *retv) {
static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{
- VARIANT prim;
+ BSTR parse_str;
HRESULT hres;
TRACE("\n");
@@ -2503,16 +2503,14 @@ static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPP
return S_OK;
}
- hres = to_primitive(dispex->ctx, get_arg(dp,0), ei, &prim);
+ hres = to_string(dispex->ctx, get_arg(dp,0), ei, &parse_str);
if(FAILED(hres))
return hres;
- if(V_VT(&prim) != VT_BSTR) {
- if(retv)
- num_set_nan(retv);
- return S_OK;
- }
- return date_parse(V_BSTR(&prim), retv);
+ hres = date_parse(parse_str, retv);
+
+ SysFreeString(parse_str);
+ return hres;
}
static HRESULT DateConstr_UTC(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
More information about the wine-cvs
mailing list