Jacek Caban : jscript: Avoid calling JS builtin functions directly.
Alexandre Julliard
julliard at winehq.org
Wed Sep 23 11:03:47 CDT 2009
Module: wine
Branch: master
Commit: a5e828194788497a88199686ffd900d5a943b174
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e828194788497a88199686ffd900d5a943b174
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 23 16:14:25 2009 +0200
jscript: Avoid calling JS builtin functions directly.
---
dlls/jscript/string.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index b44cbfd..b7d689f 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -85,14 +85,10 @@ static HRESULT String_length(script_ctx_t *ctx, DispatchEx *dispex, WORD flags,
return S_OK;
}
-/* ECMA-262 3rd Edition 15.5.4.2 */
-static HRESULT String_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp,
- VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
+static HRESULT stringobj_to_string(DispatchEx *dispex, VARIANT *retv)
{
StringInstance *string;
- TRACE("\n");
-
if(!is_class(dispex, JSCLASS_STRING)) {
WARN("this is not a string object\n");
return E_FAIL;
@@ -112,12 +108,21 @@ static HRESULT String_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags
}
/* ECMA-262 3rd Edition 15.5.4.2 */
+static HRESULT String_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp,
+ VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
+{
+ TRACE("\n");
+
+ return stringobj_to_string(dispex, retv);
+}
+
+/* ECMA-262 3rd Edition 15.5.4.2 */
static HRESULT String_valueOf(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{
TRACE("\n");
- return String_toString(ctx, dispex, flags, dp, retv, ei, sp);
+ return stringobj_to_string(dispex, retv);
}
static HRESULT do_attributeless_tag_format(DispatchEx *dispex, WORD flags, DISPPARAMS *dp,
More information about the wine-cvs
mailing list