September 2008 - Wine-commits

Jacek Caban : jscript: Added typeof expression implementation.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 67684c48509458d6b8d669333e2fe13febc6a196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67684c48509458d6b8d669333… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 02:36:03 2008 +0200 jscript: Added typeof expression implementation. --- dlls/jscript/engine.c | 70 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 13 ++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 42db70a..c15b05b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -959,10 +959,74 @@ HRESULT void_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, j return E_NOTIMPL; } -HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + const WCHAR *str; + exprval_t exprval; + VARIANT val; + HRESULT hres; + + static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; + static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; + static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; + static const WCHAR objectW[] = {'o','b','j','e','c','t',0}; + static const WCHAR stringW[] = {'s','t','r','i','n','g',0}; + static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + switch(V_VT(&val)) { + case VT_EMPTY: + str = undefinedW; + break; + case VT_NULL: + str = objectW; + break; + case VT_BOOL: + str = booleanW; + break; + case VT_I4: + case VT_R8: + str = numberW; + break; + case VT_BSTR: + str = stringW; + break; + case VT_DISPATCH: { + DispatchEx *dispex; + + dispex = iface_to_jsdisp((IUnknown*)V_DISPATCH(&val)); + if(dispex) { + str = dispex->builtin_info->class == JSCLASS_FUNCTION ? functionW : objectW; + IDispatchEx_Release(_IDispatchEx_(dispex)); + }else { + str = objectW; + } + break; + } + default: + FIXME("unhandled vt %d\n", V_VT(&val)); + hres = E_NOTIMPL; + } + + VariantClear(&val); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + V_VT(&ret->u.var) = VT_BSTR; + V_BSTR(&ret->u.var) = SysAllocString(str); + return S_OK; } HRESULT minus_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 96ecdb4..088468a 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -56,4 +56,17 @@ ok(RegExp.prototype !== undefined, "RegExp.prototype is undefined"); ok(Math !== undefined, "Math is undefined"); ok(Math.prototype === undefined, "Math.prototype is not undefined"); +ok(typeof(0) === "number", "typeof(0) is not number"); +ok(typeof(1.5) === "number", "typeof(1.5) is not number"); +ok(typeof("abc") === "string", "typeof(\"abc\") is not string"); +ok(typeof("") === "string", "typeof(\"\") is not string"); +ok(typeof(true) === "boolean", "typeof(true) is not boolean"); +ok(typeof(null) === "object", "typeof(null) is not object"); +ok(typeof(undefined) === "undefined", "typeof(undefined) is not undefined"); +ok(typeof(Math) === "object", "typeof(Math) is not object"); +ok(typeof(String.prototype) === "object", "typeof(String.prototype) is not object"); +ok(typeof(testFunc1) === "function", "typeof(testFunc1) is not function"); +ok(typeof(String) === "function", "typeof(String) is not function"); +ok(typeof(ScriptEngine) === "function", "typeof(ScriptEngine) is not function"); + reportSuccess();

1 0

Alexander Dorofeyev : quartz/tests: Fix potential NULL dereference ( Coverity).
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 48865c9064d2459074cf8813e9d72681d4c38fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=48865c9064d2459074cf8813e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Sep 9 20:34:59 2008 +0300 quartz/tests: Fix potential NULL dereference (Coverity). --- dlls/quartz/tests/filtergraph.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 0867d27..37c1c1f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1122,9 +1122,12 @@ static HRESULT TestFilter_Create(const CLSID* pClsid, const TestFilterPinData *p error: - for (i = 0; i < nPins; i++) + if (pTestFilter->ppPins) { - if (pTestFilter->ppPins[i]) IPin_Release(pTestFilter->ppPins[i]); + for (i = 0; i < nPins; i++) + { + if (pTestFilter->ppPins[i]) IPin_Release(pTestFilter->ppPins[i]); + } } CoTaskMemFree(pTestFilter->ppPins); DeleteCriticalSection(&pTestFilter->csFilter);

1 0

Juan Lang : winhttp: Don't reference past the attribute array. Fixes Coverity item 710.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 12c1e067c64513479bbf632922af498e2c832464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c1e067c64513479bbf63292… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 9 11:51:34 2008 -0700 winhttp: Don't reference past the attribute array. Fixes Coverity item 710. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ada8ae6..f377087 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -619,7 +619,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID } default: { - if (attr > sizeof(attribute_table)/sizeof(attribute_table[0]) || !attribute_table[attr]) + if (attr >= sizeof(attribute_table)/sizeof(attribute_table[0]) || !attribute_table[attr]) { FIXME("attribute %u not implemented\n", attr); return FALSE;

1 0

Jacek Caban : jscript: Added Math object stub implementation.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 083c95449ec28435a3888f7b99b28b4126e6a96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=083c95449ec28435a3888f7b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 02:35:43 2008 +0200 jscript: Added Math object stub implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/global.c | 26 +++-- dlls/jscript/jscript.h | 3 + dlls/jscript/math.c | 275 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 2 + 5 files changed, 298 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=083c95449ec28435a3888…

1 0

Jacek Caban : jscript: Added RegExp constructor object implementation.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: e2f743fad8b8ddc0ac3073f33d92855e1abee2fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f743fad8b8ddc0ac3073f33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 02:34:54 2008 +0200 jscript: Added RegExp constructor object implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/global.c | 9 ++- dlls/jscript/jscript.h | 3 + dlls/jscript/regexp.c | 143 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 1 + 5 files changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 72d908c..cdb878c 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -20,6 +20,7 @@ C_SRCS = \ lex.c \ number.c \ object.c \ + regexp.c \ string.c IDL_TLB_SRCS = jsglobal.idl diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index b90991b..6f6ca94 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -136,8 +136,9 @@ static HRESULT JSGlobal_String(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA static HRESULT JSGlobal_RegExp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return constructor_call(dispex->ctx->regexp_constr, lcid, flags, dp, retv, ei, sp); } static HRESULT JSGlobal_ActiveXObject(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -317,6 +318,10 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = create_object_constr(ctx, &ctx->regexp_constr); + if(FAILED(hres)) + return hres; + hres = create_string_constr(ctx, &ctx->string_constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9f91290..d9b1c46 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -55,6 +55,7 @@ typedef enum { JSCLASS_GLOBAL, JSCLASS_NUMBER, JSCLASS_OBJECT, + JSCLASS_REGEXP, JSCLASS_STRING } jsclass_t; @@ -135,6 +136,7 @@ struct _script_ctx_t { DispatchEx *bool_constr; DispatchEx *number_constr; DispatchEx *object_constr; + DispatchEx *regexp_constr; DispatchEx *string_constr; }; @@ -151,6 +153,7 @@ HRESULT create_array_constr(script_ctx_t*,DispatchEx**); HRESULT create_bool_constr(script_ctx_t*,DispatchEx**); HRESULT create_number_constr(script_ctx_t*,DispatchEx**); HRESULT create_object_constr(script_ctx_t*,DispatchEx**); +HRESULT create_regexp_constr(script_ctx_t*,DispatchEx**); HRESULT create_string_constr(script_ctx_t*,DispatchEx**); const char *debugstr_variant(const VARIANT*); diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c new file mode 100644 index 0000000..8bbaa6c --- /dev/null +++ b/dlls/jscript/regexp.c @@ -0,0 +1,143 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + DispatchEx dispex; +} RegExpInstance; + +static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; +static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; +static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; +static const WCHAR propertyIsEnumerableW[] = + {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; +static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; + +static HRESULT RegExp_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static void RegExp_destructor(DispatchEx *dispex) +{ + heap_free(dispex); +} + +static const builtin_prop_t RegExp_props[] = { + {hasOwnPropertyW, RegExp_hasOwnProperty, PROPF_METHOD}, + {isPrototypeOfW, RegExp_isPrototypeOf, PROPF_METHOD}, + {propertyIsEnumerableW, RegExp_propertyIsEnumerable, PROPF_METHOD}, + {toLocaleStringW, RegExp_toLocaleString, PROPF_METHOD}, + {toStringW, RegExp_toString, PROPF_METHOD} +}; + +static const builtin_info_t RegExp_info = { + JSCLASS_REGEXP, + {NULL, RegExp_value, 0}, + sizeof(RegExp_props)/sizeof(*RegExp_props), + RegExp_props, + RegExp_destructor, + NULL +}; + +static HRESULT alloc_regexp(script_ctx_t *ctx, BOOL use_constr, RegExpInstance **ret) +{ + RegExpInstance *regexp; + HRESULT hres; + + regexp = heap_alloc_zero(sizeof(RegExpInstance)); + if(!regexp) + return E_OUTOFMEMORY; + + if(use_constr) + hres = init_dispex_from_constr(&regexp->dispex, ctx, &RegExp_info, ctx->regexp_constr); + else + hres = init_dispex(&regexp->dispex, ctx, &RegExp_info, NULL); + + if(FAILED(hres)) { + heap_free(regexp); + return hres; + } + + *ret = regexp; + return S_OK; +} + +static HRESULT RegExpConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx **ret) +{ + RegExpInstance *regexp; + HRESULT hres; + + hres = alloc_regexp(ctx, FALSE, &regexp); + if(FAILED(hres)) + return hres; + + hres = create_builtin_function(ctx, RegExpConstr_value, PROPF_CONSTR, &regexp->dispex, ret); + + jsdisp_release(&regexp->dispex); + return hres; +} diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 1f20e50..1799c4a 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -52,5 +52,6 @@ ok(String.prototype !== undefined, "String.prototype is undefined"); ok(Array.prototype !== undefined, "Array.prototype is undefined"); ok(Boolean.prototype !== undefined, "Boolean.prototype is undefined"); ok(Number.prototype !== undefined, "Number.prototype is undefined"); +ok(RegExp.prototype !== undefined, "RegExp.prototype is undefined"); reportSuccess();

1 0

Jacek Caban : jscript: Added Boolean constructor object.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: f8be53fcf33208861887351be6f97861b1133763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8be53fcf33208861887351be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 02:34:16 2008 +0200 jscript: Added Boolean constructor object. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/bool.c | 147 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 9 ++- dlls/jscript/jscript.h | 3 + dlls/jscript/tests/lang.js | 1 + 5 files changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index c761787..1fb34d0 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -9,6 +9,7 @@ RC_SRCS = rsrc.rc C_SRCS = \ array.c \ + bool.c \ dispex.c \ engine.c \ function.c \ diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c new file mode 100644 index 0000000..a98a4ff --- /dev/null +++ b/dlls/jscript/bool.c @@ -0,0 +1,147 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + DispatchEx dispex; +} BoolInstance; + +static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; +static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; +static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; +static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; +static const WCHAR propertyIsEnumerableW[] = + {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; +static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; + +static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Bool_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Bool_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Bool_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Bool_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t Bool_props[] = { + {hasOwnPropertyW, Bool_hasOwnProperty, PROPF_METHOD}, + {isPrototypeOfW, Bool_isPrototypeOf, PROPF_METHOD}, + {propertyIsEnumerableW, Bool_propertyIsEnumerable, PROPF_METHOD}, + {toLocaleStringW, Bool_toLocaleString, PROPF_METHOD}, + {toStringW, Bool_toString, PROPF_METHOD}, + {valueOfW, Bool_valueOf, PROPF_METHOD} +}; + +static const builtin_info_t Bool_info = { + JSCLASS_BOOLEAN, + {NULL, Bool_value, 0}, + sizeof(Bool_props)/sizeof(*Bool_props), + Bool_props, + NULL, + NULL +}; + +static HRESULT BoolConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT alloc_bool(script_ctx_t *ctx, BOOL use_constr, BoolInstance **ret) +{ + BoolInstance *bool; + HRESULT hres; + + bool = heap_alloc_zero(sizeof(BoolInstance)); + if(!bool) + return E_OUTOFMEMORY; + + if(use_constr) + hres = init_dispex_from_constr(&bool->dispex, ctx, &Bool_info, ctx->bool_constr); + else + hres = init_dispex(&bool->dispex, ctx, &Bool_info, NULL); + + if(FAILED(hres)) { + heap_free(bool); + return hres; + } + + *ret = bool; + return S_OK; +} + +HRESULT create_bool_constr(script_ctx_t *ctx, DispatchEx **ret) +{ + BoolInstance *bool; + HRESULT hres; + + hres = alloc_bool(ctx, FALSE, &bool); + if(FAILED(hres)) + return hres; + + hres = create_builtin_function(ctx, BoolConstr_value, PROPF_CONSTR, &bool->dispex, ret); + + jsdisp_release(&bool->dispex); + return hres; +} diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index bc4f14a..2f78231 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -90,8 +90,9 @@ static HRESULT JSGlobal_Array(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR static HRESULT JSGlobal_Boolean(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return constructor_call(dispex->ctx->bool_constr, lcid, flags, dp, retv, ei, sp); } static HRESULT JSGlobal_Date(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -303,6 +304,10 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = create_bool_constr(ctx, &ctx->bool_constr); + if(FAILED(hres)) + return hres; + hres = create_object_constr(ctx, &ctx->object_constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d5ba1c4..9515c51 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -50,6 +50,7 @@ typedef struct DispatchEx DispatchEx; typedef enum { JSCLASS_NONE, JSCLASS_ARRAY, + JSCLASS_BOOLEAN, JSCLASS_FUNCTION, JSCLASS_GLOBAL, JSCLASS_OBJECT, @@ -130,6 +131,7 @@ struct _script_ctx_t { DispatchEx *script_disp; DispatchEx *global; DispatchEx *array_constr; + DispatchEx *bool_constr; DispatchEx *object_constr; DispatchEx *string_constr; }; @@ -144,6 +146,7 @@ static inline void script_addref(script_ctx_t *ctx) HRESULT init_global(script_ctx_t*); HRESULT create_array_constr(script_ctx_t*,DispatchEx**); +HRESULT create_bool_constr(script_ctx_t*,DispatchEx**); HRESULT create_object_constr(script_ctx_t*,DispatchEx**); HRESULT create_string_constr(script_ctx_t*,DispatchEx**); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b5f2512..e6587cf 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -50,5 +50,6 @@ ok(Object.prototype !== undefined, "Object.prototype is undefined"); ok(Object.prototype.prototype === undefined, "Object.prototype is not undefined"); ok(String.prototype !== undefined, "String.prototype is undefined"); ok(Array.prototype !== undefined, "Array.prototype is undefined"); +ok(Boolean.prototype !== undefined, "Boolean.prototype is undefined"); reportSuccess();

1 0

Jacek Caban : jscript: Added Number constructor object implementation.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 7a3d60e9130aca54b0561c5cadc0468c27fd38d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3d60e9130aca54b0561c5ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 02:34:33 2008 +0200 jscript: Added Number constructor object implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/global.c | 9 ++- dlls/jscript/jscript.h | 3 + dlls/jscript/number.c | 167 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 1 + 5 files changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 1fb34d0..72d908c 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ jscript_main.c \ jsutils.c \ lex.c \ + number.c \ object.c \ string.c diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2f78231..b90991b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -112,8 +112,9 @@ static HRESULT JSGlobal_Function(DispatchEx *dispex, LCID lcid, WORD flags, DISP static HRESULT JSGlobal_Number(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return constructor_call(dispex->ctx->number_constr, lcid, flags, dp, retv, ei, sp); } static HRESULT JSGlobal_Object(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -308,6 +309,10 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = create_number_constr(ctx, &ctx->number_constr); + if(FAILED(hres)) + return hres; + hres = create_object_constr(ctx, &ctx->object_constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9515c51..9f91290 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -53,6 +53,7 @@ typedef enum { JSCLASS_BOOLEAN, JSCLASS_FUNCTION, JSCLASS_GLOBAL, + JSCLASS_NUMBER, JSCLASS_OBJECT, JSCLASS_STRING } jsclass_t; @@ -132,6 +133,7 @@ struct _script_ctx_t { DispatchEx *global; DispatchEx *array_constr; DispatchEx *bool_constr; + DispatchEx *number_constr; DispatchEx *object_constr; DispatchEx *string_constr; }; @@ -147,6 +149,7 @@ HRESULT init_global(script_ctx_t*); HRESULT create_array_constr(script_ctx_t*,DispatchEx**); HRESULT create_bool_constr(script_ctx_t*,DispatchEx**); +HRESULT create_number_constr(script_ctx_t*,DispatchEx**); HRESULT create_object_constr(script_ctx_t*,DispatchEx**); HRESULT create_string_constr(script_ctx_t*,DispatchEx**); diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c new file mode 100644 index 0000000..b4db863 --- /dev/null +++ b/dlls/jscript/number.c @@ -0,0 +1,167 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + DispatchEx dispex; +} NumberInstance; + +static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; +static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; +static const WCHAR toFixedW[] = {'t','o','F','i','x','e','d',0}; +static const WCHAR toExponentialW[] = {'t','o','E','x','p','o','n','e','n','t','i','a','l',0}; +static const WCHAR toPrecisionW[] = {'t','o','P','r','e','c','i','s','i','o','n',0}; +static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; +static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; +static const WCHAR propertyIsEnumerableW[] = + {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; +static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; + +static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_toFixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_toExponential(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_toPrecision(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Number_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t Number_props[] = { + {hasOwnPropertyW, Number_hasOwnProperty, PROPF_METHOD}, + {isPrototypeOfW, Number_isPrototypeOf, PROPF_METHOD}, + {propertyIsEnumerableW, Number_propertyIsEnumerable, PROPF_METHOD}, + {toExponentialW, Number_toExponential, PROPF_METHOD}, + {toFixedW, Number_toFixed, PROPF_METHOD}, + {toLocaleStringW, Number_toLocaleString, PROPF_METHOD}, + {toPrecisionW, Number_toPrecision, PROPF_METHOD}, + {toStringW, Number_toString, PROPF_METHOD}, + {valueOfW, Number_valueOf, PROPF_METHOD} +}; + +static const builtin_info_t Number_info = { + JSCLASS_NUMBER, + {NULL, Number_value, 0}, + sizeof(Number_props)/sizeof(*Number_props), + Number_props, + NULL, + NULL +}; + +static HRESULT NumberConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT alloc_number(script_ctx_t *ctx, BOOL use_constr, NumberInstance **ret) +{ + NumberInstance *number = heap_alloc_zero(sizeof(NumberInstance)); + HRESULT hres; + + if(use_constr) + hres = init_dispex_from_constr(&number->dispex, ctx, &Number_info, ctx->number_constr); + else + hres = init_dispex(&number->dispex, ctx, &Number_info, NULL); + if(FAILED(hres)) + return hres; + + *ret = number; + return S_OK; +} + +HRESULT create_number_constr(script_ctx_t *ctx, DispatchEx **ret) +{ + NumberInstance *number; + HRESULT hres; + + hres = alloc_number(ctx, FALSE, &number); + if(FAILED(hres)) + return hres; + + hres = create_builtin_function(ctx, NumberConstr_value, PROPF_CONSTR, &number->dispex, ret); + + jsdisp_release(&number->dispex); + return hres; +} diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index e6587cf..1f20e50 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -51,5 +51,6 @@ ok(Object.prototype.prototype === undefined, "Object.prototype is not undefined" ok(String.prototype !== undefined, "String.prototype is undefined"); ok(Array.prototype !== undefined, "Array.prototype is undefined"); ok(Boolean.prototype !== undefined, "Boolean.prototype is undefined"); +ok(Number.prototype !== undefined, "Number.prototype is undefined"); reportSuccess();

1 0

Jacek Caban : jscript: Added Array constructor object implementation.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 54d03ab8579cd7d1d5255b2e7b6a6a4405f8e66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d03ab8579cd7d1d5255b2e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 02:33:57 2008 +0200 jscript: Added Array constructor object implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/array.c | 253 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 9 ++- dlls/jscript/jscript.h | 3 + dlls/jscript/tests/lang.js | 1 + 5 files changed, 265 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54d03ab8579cd7d1d5255…

1 0

Jacek Caban : jscript: Added String constructor object.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 8482abe29ccdd2f39f6918c5dc8272a4d0de832e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8482abe29ccdd2f39f6918c5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 10 02:33:37 2008 +0200 jscript: Added String constructor object. --- dlls/jscript/Makefile.in | 3 +- dlls/jscript/global.c | 9 +- dlls/jscript/jscript.h | 5 +- dlls/jscript/string.c | 421 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 1 + 5 files changed, 435 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8482abe29ccdd2f39f691…

1 0

Rob Shearman : widl: Fix the writing typedefs to dispinterfaces and pointers to interfaces.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 39978c68f9ed140f71811109523cd9dadf198f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39978c68f9ed140f718111095… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 10 08:00:27 2008 +0100 widl: Fix the writing typedefs to dispinterfaces and pointers to interfaces. Currently, stdole2.tlb isn't generated correctly and causes "<failed>" to appear instead of "FontEvents" in the IFontEventsDisp typedef when viewed with oleview. The problem is that the typedef should just generate a VT_USERDEFINED record, but ends up generating a VT_PTR -> VT_USERDEFINED. So remove the extra writing of VT_PTR entries. Fix the skipped pointers checks in encode_type and encode_type to specifically detect VT_UNKNOWN and VT_DISPATCH types which don't need one level of pointers, whereas interfaces encoded as VT_USERDEFINED do. --- tools/widl/write_msft.c | 26 ++++++-------------------- 1 files changed, 6 insertions(+), 20 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 198ce2d..28a74f2 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -885,7 +885,9 @@ static int encode_type( next_vt = VT_VOID; encode_type(typelib, next_vt, type->ref, &target_type, NULL, NULL, &child_size); - if(type->ref && (type->ref->type == RPC_FC_IP)) { + /* these types already have an implicit pointer, so we don't need to + * add another */ + if(next_vt == VT_DISPATCH || next_vt == VT_UNKNOWN) { chat("encode_type: skipping ptr\n"); *encoded_type = target_type; *width = 4; @@ -1030,24 +1032,6 @@ static int encode_type( *encoded_type = typeoffset; *width = 0; *alignment = 1; - - if(type->type == RPC_FC_IP) { - for (typeoffset = 0; typeoffset < typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { - typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - if ((typedata[0] == ((0x7fff << 16) | VT_PTR)) && (typedata[1] == *encoded_type)) break; - } - if (typeoffset == typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length) { - typeoffset = ctl2_alloc_segment(typelib, MSFT_SEG_TYPEDESC, 8, 0); - typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; - - typedata[0] = (0x7fff << 16) | VT_PTR; - typedata[1] = *encoded_type; - } - *encoded_type = typeoffset; - *width = 4; - *alignment = 4; - *decoded_size += 8; - } break; } @@ -1177,7 +1161,9 @@ static int encode_var( dump_type(type); encode_type(typelib, vt, type, encoded_type, width, alignment, decoded_size); - if(type->type == RPC_FC_IP) return 2; + /* these types already have an implicit pointer, so we don't need to + * add another */ + if(vt == VT_DISPATCH || vt == VT_UNKNOWN) return 2; return 0; }

1 0