August 2009 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Use the decoder list to decide how to load image files.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: b99abe2e9164d74d2dcba59f6c2ed5f5663c12be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99abe2e9164d74d2dcba59f6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 25 17:43:33 2009 -0500 gdiplus: Use the decoder list to decide how to load image files. --- dlls/gdiplus/image.c | 305 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 204 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b99abe2e9164d74d2dcba…

1 0

Vincent Povirk : gdiplus: Add PNG to the decoders list.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: 2f0b4bf36b3f87417976661d1807fbf16452d00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0b4bf36b3f87417976661d1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 25 16:53:56 2009 -0500 gdiplus: Add PNG to the decoders list. --- dlls/gdiplus/image.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e65182f..6ec2c64 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1426,6 +1426,7 @@ typedef enum { GIF, EMF, WMF, + PNG, ICO, NUM_CODECS } ImageFormat; @@ -1594,6 +1595,13 @@ static const WCHAR wmf_format[] = {'W','M','F',0}; static const BYTE wmf_sig_pattern[] = { 0xd7, 0xcd }; static const BYTE wmf_sig_mask[] = { 0xFF, 0xFF }; +static const WCHAR png_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'P','N','G', 0}; +static const WCHAR png_extension[] = {'*','.','P','N','G',0}; +static const WCHAR png_mimetype[] = {'i','m','a','g','e','/','p','n','g', 0}; +static const WCHAR png_format[] = {'P','N','G',0}; +static const BYTE png_sig_pattern[] = { 137, 80, 78, 71, 13, 10, 26, 10, }; +static const BYTE png_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + static const WCHAR ico_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'I','C','O', 0}; static const WCHAR ico_extension[] = {'*','.','I','C','O',0}; static const WCHAR ico_mimetype[] = {'i','m','a','g','e','/','x','-','i','c','o','n', 0}; @@ -1693,6 +1701,24 @@ static const struct image_codec codecs[NUM_CODECS] = { NULL }, { + { /* PNG */ + /* Clsid */ { 0x557cf406, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, + /* FormatID */ { 0xb96b3cafU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} }, + /* CodecName */ png_codecname, + /* DllName */ NULL, + /* FormatDescription */ png_format, + /* FilenameExtension */ png_extension, + /* MimeType */ png_mimetype, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Version */ 1, + /* SigCount */ 1, + /* SigSize */ 8, + /* SigPattern */ png_sig_pattern, + /* SigMask */ png_sig_mask, + }, + NULL + }, + { { /* ICO */ /* Clsid */ { 0x557cf407, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, /* FormatID */ { 0xb96b3cabU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} },

1 0

Alexandre Julliard : kernel32: Fix the GetThreadPriorityBoost return value.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: cb0607ced2be5165a3c964f6215da86d5dfe1915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0607ced2be5165a3c964f62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 12:22:13 2009 +0200 kernel32: Fix the GetThreadPriorityBoost return value. --- dlls/kernel32/tests/thread.c | 11 +++++------ dlls/kernel32/thread.c | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e80c63e..275f6aa 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -698,8 +698,7 @@ static VOID test_thread_priority(void) return; } - todo_wine - ok(rc!=0,"error=%d\n",GetLastError()); + ok(rc!=0,"error=%d\n",GetLastError()); if (pOpenThread) { /* check that access control is obeyed */ @@ -709,7 +708,7 @@ static VOID test_thread_priority(void) ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); if (access_thread!=NULL) { obey_ar(pSetThreadPriorityBoost(access_thread,1)==0); - obey_ar(pGetThreadPriorityBoost(access_thread,&disabled)==0); + todo_wine obey_ar(pGetThreadPriorityBoost(access_thread,&disabled)==0); ok(CloseHandle(access_thread),"Error Closing thread handle\n"); } } @@ -723,10 +722,10 @@ static VOID test_thread_priority(void) rc = pSetThreadPriorityBoost(curthread,0); ok( rc != 0, "error=%d\n",GetLastError()); - rc=pGetThreadPriorityBoost(curthread,&disabled); - ok(rc!=0 && disabled==0, - "rc=%d error=%d disabled=%d\n",rc,GetLastError(),disabled); } + rc=pGetThreadPriorityBoost(curthread,&disabled); + ok(rc!=0 && disabled==0, + "rc=%d error=%d disabled=%d\n",rc,GetLastError(),disabled); } /* check the GetThreadTimes function */ diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index b037f44..0029e11 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -352,7 +352,7 @@ BOOL WINAPI GetThreadPriorityBoost( PBOOL pstate) /* [out] pointer to var that receives the boost state */ { if (pstate) *pstate = FALSE; - return NO_ERROR; + return TRUE; }

1 0

Alexandre Julliard : configure: Check for mpg123_feed function since we require it.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: 7bf8d057d35bfebc84fcc77ffd400cea62ac66d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf8d057d35bfebc84fcc77ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 29 12:20:25 2009 +0200 configure: Check for mpg123_feed function since we require it. --- configure | 24 ++++++++++++------------ configure.ac | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure b/configure index bcf67cf..fa67fcb 100755 --- a/configure +++ b/configure @@ -11273,9 +11273,9 @@ fi if test "$ac_cv_header_mpg123_h" = "yes" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_init in -lmpg123" >&5 -$as_echo_n "checking for mpg123_init in -lmpg123... " >&6; } -if test "${ac_cv_lib_mpg123_mpg123_init+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in -lmpg123" >&5 +$as_echo_n "checking for mpg123_feed in -lmpg123... " >&6; } +if test "${ac_cv_lib_mpg123_mpg123_feed+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11289,27 +11289,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char mpg123_init (); +char mpg123_feed (); int main () { -return mpg123_init (); +return mpg123_feed (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mpg123_mpg123_init=yes + ac_cv_lib_mpg123_mpg123_feed=yes else - ac_cv_lib_mpg123_mpg123_init=no + ac_cv_lib_mpg123_mpg123_feed=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpg123_mpg123_init" >&5 -$as_echo "$ac_cv_lib_mpg123_mpg123_init" >&6; } -if test "x$ac_cv_lib_mpg123_mpg123_init" = x""yes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpg123_mpg123_feed" >&5 +$as_echo "$ac_cv_lib_mpg123_mpg123_feed" >&6; } +if test "x$ac_cv_lib_mpg123_mpg123_feed" = x""yes; then : LIBMPG123="-lmpg123" fi @@ -11317,9 +11317,9 @@ fi fi if test "x$ac_cv_lib_mpg123_mpg123_init" != xyes; then : case "x$with_mpg123" in - x) wine_notices="$wine_notices|libmpg123 ${notice_platform}development files not found, mp3 codec won't be supported." ;; + x) wine_notices="$wine_notices|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;; xno) ;; - *) as_fn_error "libmpg123 ${notice_platform}development files not found, mp3 codec won't be supported. + *) as_fn_error "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported. This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index c880ad3..1925035 100644 --- a/configure.ac +++ b/configure.ac @@ -1411,10 +1411,10 @@ WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], dnl **** Check for mpg123 **** if test "$ac_cv_header_mpg123_h" = "yes" then - AC_CHECK_LIB(mpg123,mpg123_init,[AC_SUBST(LIBMPG123,"-lmpg123")]) + AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")]) fi WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_init" != xyes], - [libmpg123 ${notice_platform}development files not found, mp3 codec won't be supported.]) + [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.]) test "x$ac_cv_lib_mpg123_mpg123_init" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no} dnl **** Check for libkstat ****

1 0

Jacek Caban : jscript: Make Array.push generic.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: 06064d2213d28fe6d5a599d9cb099767620b7ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06064d2213d28fe6d5a599d9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 29 00:03:22 2009 +0200 jscript: Make Array.push generic. --- dlls/jscript/array.c | 36 +++++++++++++++++++++++++++++++++--- dlls/jscript/tests/api.js | 13 +++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 2aea70b..6b7a58f 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -46,6 +46,29 @@ static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; static const WCHAR default_separatorW[] = {',',0}; +static HRESULT get_jsdisp_length(DispatchEx *obj, LCID lcid, jsexcept_t *ei, DWORD *ret) +{ + VARIANT var; + HRESULT hres; + + hres = jsdisp_propget_name(obj, lengthW, lcid, &var, ei, NULL/*FIXME*/); + if(FAILED(hres)) + return hres; + + hres = to_uint32(obj->ctx, &var, ei, ret); + VariantClear(&var); + return hres; +} + +static HRESULT set_jsdisp_length(DispatchEx *obj, LCID lcid, jsexcept_t *ei, DWORD length) +{ + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = length; + return jsdisp_propput_name(obj, lengthW, lcid, &var, ei, NULL/*FIXME*/); +} + static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -380,17 +403,24 @@ static HRESULT Array_push(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS if(dispex->builtin_info->class == JSCLASS_ARRAY) { length = ((ArrayInstance*)dispex)->length; }else { - FIXME("not Array this\n"); - return E_NOTIMPL; + hres = get_jsdisp_length(dispex, lcid, ei, &length); + if(FAILED(hres)) + return hres; } - n = dp->cArgs - dp->cNamedArgs; + n = arg_cnt(dp); for(i=0; i < n; i++) { hres = jsdisp_propput_idx(dispex, length+i, lcid, get_arg(dp, i), ei, sp); if(FAILED(hres)) return hres; } + if(!is_class(dispex, JSCLASS_ARRAY)) { + hres = set_jsdisp_length(dispex, lcid, ei, length+n); + if(FAILED(hres)) + return hres; + } + if(retv) { V_VT(retv) = VT_I4; V_I4(retv) = length+n; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 75074a1..d5d7fb3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -492,6 +492,19 @@ ok(arr.push(true, 'b', false) === 10, "arr.push(true, 'b', false) !== 10"); ok(arr[8] === "b", "arr[8] != 'b'"); ok(arr.length === 10, "arr.length != 10"); +var arr = new Object(); +arr.push = Array.prototype.push; + +arr.length = 6; + +ok(arr.push() === 6, "arr.push() !== 6"); +ok(arr.push(1) === 7, "arr.push(1) !== 7"); +ok(arr[6] === 1, "arr[6] != 1"); +ok(arr.length === 7, "arr.length != 10"); +ok(arr.push(true, 'b', false) === 10, "arr.push(true, 'b', false) !== 10"); +ok(arr[8] === "b", "arr[8] != 'b'"); +ok(arr.length === 10, "arr.length != 10"); + arr = [3,4,5]; tmp = arr.pop(); ok(arr.length === 2, "arr.length = " + arr.length);

1 0

Jacek Caban : jscript: Added Function.apply implementation.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: 5c819cb21bf947d40b9804a50431f135aa21f828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c819cb21bf947d40b9804a50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 29 00:02:49 2009 +0200 jscript: Added Function.apply implementation. --- dlls/jscript/function.c | 89 +++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 7 ++++ 2 files changed, 93 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 3ba4481..e8bfe75 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -346,11 +346,94 @@ static HRESULT Function_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISP return S_OK; } +static HRESULT array_to_args(DispatchEx *arg_array, LCID lcid, jsexcept_t *ei, IServiceProvider *caller, + DISPPARAMS *args) +{ + VARIANT var, *argv; + DWORD length, i; + HRESULT hres; + + hres = jsdisp_propget_name(arg_array, lengthW, lcid, &var, ei, NULL/*FIXME*/); + if(FAILED(hres)) + return hres; + + hres = to_uint32(arg_array->ctx, &var, ei, &length); + VariantClear(&var); + if(FAILED(hres)) + return hres; + + argv = heap_alloc(length * sizeof(VARIANT)); + if(FAILED(hres)) + return E_OUTOFMEMORY; + + for(i=0; i<length; i++) { + hres = jsdisp_propget_idx(arg_array, i, lcid, argv+i, ei, caller); + if(FAILED(hres)) { + while(i--) + VariantClear(argv+i); + heap_free(argv); + return hres; + } + } + + args->cArgs = length; + args->rgvarg = argv; + return S_OK; +} + static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + FunctionInstance *function; + DISPPARAMS args = {NULL,NULL,0,0}; + DWORD argc, i; + IDispatch *this_obj; + HRESULT hres = S_OK; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_FUNCTION)) { + FIXME("dispex is not a function\n"); + return E_FAIL; + } + + function = (FunctionInstance*)dispex; + argc = arg_cnt(dp); + + if(argc) { + hres = to_object(dispex->ctx, get_arg(dp,0), &this_obj); + if(FAILED(hres)) + return hres; + } + + if(argc >= 2) { + DispatchEx *arg_array = NULL; + + if(V_VT(get_arg(dp,1)) == VT_DISPATCH) { + arg_array = iface_to_jsdisp((IUnknown*)V_DISPATCH(get_arg(dp,1))); + if(!is_class(arg_array, JSCLASS_ARRAY) && !is_class(arg_array, JSCLASS_ARGUMENTS)) { + jsdisp_release(arg_array); + arg_array = NULL; + } + } + + if(arg_array) { + hres = array_to_args(arg_array, lcid, ei, caller, &args); + jsdisp_release(arg_array); + }else { + FIXME("throw TypeError"); + hres = E_FAIL; + } + } + + hres = call_function(function, this_obj, lcid, &args, retv, ei, caller); + + if(this_obj) + IDispatch_Release(this_obj); + for(i=0; i<args.cArgs; i++) + VariantClear(args.rgvarg+i); + heap_free(args.rgvarg); + return hres; } static HRESULT Function_call(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 06df0ae..75074a1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1137,12 +1137,19 @@ function callTest(argc) { callTest.call(tmp, 1, 1); callTest.call(tmp, 2, 1, 2); +callTest.apply(tmp, [1, 1]); +callTest.apply(tmp, [2, 1, 2]); +(function () { callTest.apply(tmp, arguments); })(2,1,2); + function callTest2() { ok(this === tmp, "this !== tmp\n"); ok(arguments.length === 0, "callTest2: arguments.length = " + arguments.length + " expected 0"); } callTest2.call(tmp); +callTest2.apply(tmp, []); +callTest2.apply(tmp); +(function () { callTest2.apply(tmp, arguments); })(); function callTest3() { ok(arguments.length === 0, "arguments.length = " + arguments.length + " expected 0");

1 0

Jacek Caban : jscript: Added Function.call implementation.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: 8761462b8236d47318081edb95524453423fcdef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8761462b8236d47318081edb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 29 00:02:22 2009 +0200 jscript: Added Function.call implementation. --- dlls/jscript/function.c | 63 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 28 ++++++++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 59ece20..3ba4481 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -254,6 +254,34 @@ static HRESULT invoke_value_proc(FunctionInstance *function, LCID lcid, WORD fla return hres; } +static HRESULT call_function(FunctionInstance *function, IDispatch *this_obj, LCID lcid, DISPPARAMS *args, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + HRESULT hres; + + if(function->value_proc) { + DispatchEx *jsthis = NULL; + + if(this_obj) { + jsthis = iface_to_jsdisp((IUnknown*)this_obj); + if(!jsthis) + FIXME("this_obj is not DispatchEx\n"); + } + + hres = function->value_proc(jsthis ? jsthis : function->dispex.ctx->script_disp, lcid, + DISPATCH_METHOD, args, retv, ei, caller); + + if(jsthis) + jsdisp_release(jsthis); + }else { + hres = invoke_source(function, + this_obj ? this_obj : (IDispatch*)_IDispatchEx_(function->dispex.ctx->script_disp), + lcid, args, retv, ei, caller); + } + + return hres; +} + static HRESULT function_to_string(FunctionInstance *function, BSTR *ret) { BSTR str; @@ -326,10 +354,39 @@ static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR } static HRESULT Function_call(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + FunctionInstance *function; + DISPPARAMS args = {NULL,NULL,0,0}; + IDispatch *this_obj = NULL; + DWORD argc; + HRESULT hres; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_FUNCTION)) { + FIXME("dispex is not a function\n"); + return E_FAIL; + } + + function = (FunctionInstance*)dispex; + argc = arg_cnt(dp); + + if(argc) { + hres = to_object(dispex->ctx, get_arg(dp,0), &this_obj); + if(FAILED(hres)) + return hres; + args.cArgs = argc-1; + } + + if(args.cArgs) + args.rgvarg = dp->rgvarg + dp->cArgs - args.cArgs-1; + + hres = call_function(function, this_obj, lcid, &args, retv, ei, caller); + + if(this_obj) + IDispatch_Release(this_obj); + return hres; } HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index db7bf68..06df0ae 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1125,6 +1125,34 @@ ok(testFuncToString.toString() === "function testFuncToString(x,y) {\n return ok("" + testFuncToString === "function testFuncToString(x,y) {\n return x+y;\n}", "'' + testFuncToString = " + testFuncToString); +tmp = new Object(); + +function callTest(argc) { + ok(this === tmp, "this !== tmp\n"); + ok(arguments.length === argc+1, "arguments.length = " + arguments.length + " expected " + (argc+1)); + for(var i=1; i <= argc; i++) + ok(arguments[i] === i, "arguments[i] = " + arguments[i]); +} + +callTest.call(tmp, 1, 1); +callTest.call(tmp, 2, 1, 2); + +function callTest2() { + ok(this === tmp, "this !== tmp\n"); + ok(arguments.length === 0, "callTest2: arguments.length = " + arguments.length + " expected 0"); +} + +callTest2.call(tmp); + +function callTest3() { + ok(arguments.length === 0, "arguments.length = " + arguments.length + " expected 0"); +} + +callTest3.call(); + +tmp = Number.prototype.toString.call(3); +ok(tmp === "3", "Number.prototype.toString.call(3) = " + tmp); + var date = new Date(); date = new Date(100);

1 0

Jacek Caban : jscript: Create arguments object as a seaprated class inheriting from Object.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: 662efe835bc9bf8ff712c2cb7691e318fa165a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=662efe835bc9bf8ff712c2cb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 29 00:01:57 2009 +0200 jscript: Create arguments object as a seaprated class inheriting from Object. --- dlls/jscript/function.c | 66 ++++++++++++++++++++++++++++++++----------- dlls/jscript/jscript.h | 4 ++- dlls/jscript/object.c | 2 +- dlls/jscript/tests/api.js | 2 + dlls/jscript/tests/lang.js | 6 ++++ 5 files changed, 61 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index f54c8c6..59ece20 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -85,22 +85,58 @@ static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function, return S_OK; } -static HRESULT init_arguments(DispatchEx *arg_disp, FunctionInstance *function, LCID lcid, DISPPARAMS *dp, - jsexcept_t *ei, IServiceProvider *caller) +HRESULT Arguments_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_info_t Arguments_info = { + JSCLASS_ARGUMENTS, + {NULL, Arguments_value, 0}, + 0, NULL, + NULL, + NULL +}; + +static HRESULT create_arguments(script_ctx_t *ctx, LCID lcid, DISPPARAMS *dp, + jsexcept_t *ei, IServiceProvider *caller, DispatchEx **ret) { + DispatchEx *args; VARIANT var; DWORD i; HRESULT hres; - for(i=0; i < dp->cArgs-dp->cNamedArgs; i++) { - hres = jsdisp_propput_idx(arg_disp, i, lcid, dp->rgvarg+dp->cArgs-1-i, ei, caller); + args = heap_alloc_zero(sizeof(DispatchEx)); + if(!args) + return E_OUTOFMEMORY; + + hres = init_dispex_from_constr(args, ctx, &Arguments_info, ctx->object_constr); + if(FAILED(hres)) { + heap_free(args); + return hres; + } + + for(i=0; i < arg_cnt(dp); i++) { + hres = jsdisp_propput_idx(args, i, lcid, get_arg(dp,i), ei, caller); if(FAILED(hres)) - return hres; + break; } - V_VT(&var) = VT_I4; - V_I4(&var) = dp->cArgs - dp->cNamedArgs; - return jsdisp_propput_name(arg_disp, lengthW, lcid, &var, ei, caller); + if(SUCCEEDED(hres)) { + V_VT(&var) = VT_I4; + V_I4(&var) = arg_cnt(dp); + hres = jsdisp_propput_name(args, lengthW, lcid, &var, ei, caller); + } + + if(FAILED(hres)) { + jsdisp_release(args); + return hres; + } + + *ret = args; + return S_OK; } static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, jsexcept_t *ei, @@ -115,17 +151,13 @@ static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS if(FAILED(hres)) return hres; - hres = create_dispex(function->dispex.ctx, NULL, NULL, &arg_disp); + hres = create_arguments(function->dispex.ctx, lcid, dp, ei, caller, &arg_disp); if(SUCCEEDED(hres)) { - hres = init_arguments(arg_disp, function, lcid, dp, ei, caller); - if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_DISPATCH; - V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(arg_disp); - hres = jsdisp_propput_name(var_disp, argumentsW, lcid, &var, ei, caller); - } + VARIANT var; + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(arg_disp); + hres = jsdisp_propput_name(var_disp, argumentsW, lcid, &var, ei, caller); jsdisp_release(arg_disp); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 01a6911..628cdfb 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -69,6 +69,7 @@ extern HINSTANCE jscript_hinstance; #define PROPF_ENUM 0x0200 #define PROPF_CONSTR 0x0400 +/* NOTE: Keep in sync with names in Object.toString implementation */ typedef enum { JSCLASS_NONE, JSCLASS_ARRAY, @@ -81,7 +82,8 @@ typedef enum { JSCLASS_NUMBER, JSCLASS_OBJECT, JSCLASS_REGEXP, - JSCLASS_STRING + JSCLASS_STRING, + JSCLASS_ARGUMENTS } jsclass_t; typedef HRESULT (*builtin_invoke_t)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index e8624bd..a87fa1f 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -49,7 +49,7 @@ static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, - functionW, NULL, mathW, numberW, objectW, regexpW, stringW}; + functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW}; TRACE("\n"); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a77f31a..db7bf68 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1422,6 +1422,8 @@ testObjectInherit(new Error(), Error, false, true, true); testObjectInherit(testObjectInherit, Function, false, true, true); testObjectInherit(Math, Object, true, true, true); +(function() { testObjectInherit(arguments, Object, true, true, true); })(); + function testFunctions(obj, arr) { var l; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index e3abe27..5cd97d2 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -811,6 +811,12 @@ ok((1 instanceof Object) === false, "1 is instance of Object"); ok((false instanceof Boolean) === false, "false is instance of Boolean"); ok(("" instanceof Object) === false, "'' is instance of Object"); +(function () { + ok((arguments instanceof Object) === true, "argument is not instance of Object"); + ok((arguments instanceof Array) === false, "argument is not instance of Array"); + ok(arguments.toString() === "[object Object]", "arguments.toString() = " + arguments.toString()); +})(1,2); + ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); ok(isNaN(Infinity) === false, "isNaN(Infinity) !== false");

1 0

Jacek Caban : jscript: Added 'instanceof' keyword implementation.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: 2a457fb701f3cdc22445f16b33164ca51450fb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a457fb701f3cdc22445f16b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 29 00:01:25 2009 +0200 jscript: Added 'instanceof' keyword implementation. --- dlls/jscript/engine.c | 70 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 23 ++++++++------ dlls/jscript/tests/lang.js | 15 +++++++++ dlls/jscript/tests/run.c | 2 + 4 files changed, 97 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8035e78..43b422c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1954,10 +1954,74 @@ HRESULT binary_and_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f } /* ECMA-262 3rd Edition 11.8.6 */ -HRESULT instanceof_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT instanceof_eval(exec_ctx_t *ctx, VARIANT *inst, VARIANT *objv, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *obj, *iter, *tmp = NULL; + VARIANT_BOOL ret = VARIANT_FALSE; + BOOL b; + VARIANT var; + HRESULT hres; + + static const WCHAR prototypeW[] = {'p','r','o','t','o','t', 'y', 'p','e',0}; + + if(V_VT(objv) != VT_DISPATCH) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(objv)); + if(!obj) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(is_class(obj, JSCLASS_FUNCTION)) { + hres = jsdisp_propget_name(obj, prototypeW, ctx->parser->script->lcid, &var, ei, NULL/*FIXME*/); + }else { + FIXME("throw TypeError\n"); + hres = E_FAIL; + } + jsdisp_release(obj); + if(FAILED(hres)) + return hres; + + if(V_VT(&var) == VT_DISPATCH) { + if(V_VT(inst) == VT_DISPATCH) + tmp = iface_to_jsdisp((IUnknown*)V_DISPATCH(inst)); + for(iter = tmp; iter; iter = iter->prototype) { + hres = disp_cmp(V_DISPATCH(&var), (IDispatch*)_IDispatchEx_(iter), &b); + if(FAILED(hres)) + break; + if(b) { + ret = VARIANT_TRUE; + break; + } + } + + if(tmp) + jsdisp_release(tmp); + }else { + FIXME("prototype is not an object\n"); + hres = E_FAIL; + } + + VariantClear(&var); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = ret; + return S_OK; +} + +/* ECMA-262 3rd Edition 11.8.6 */ +HRESULT instanceof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, instanceof_eval, ei, ret); } /* ECMA-262 3rd Edition 11.8.7 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index efc55a4..a77f31a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1376,7 +1376,10 @@ exception_test(function() {eval("while(")}, "SyntaxError", -2146827286); exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); -function testObjectInherit(obj, ts, tls, vo) { +function testObjectInherit(obj, constr, ts, tls, vo) { + ok(obj instanceof Object, "obj is not instance of Object"); + ok(obj instanceof constr, "obj is not instance of its constructor"); + ok(obj.hasOwnProperty === Object.prototype.hasOwnProperty, "obj.hasOwnProperty !== Object.prototype.hasOwnProprty"); ok(obj.isPrototypeOf === Object.prototype.isPrototypeOf, @@ -1409,15 +1412,15 @@ function testObjectInherit(obj, ts, tls, vo) { } Object.prototype._test = "test"; -testObjectInherit(new String("test"), false, true, false); -testObjectInherit(/test/g, false, true, true); -testObjectInherit(new Number(1), false, false, false); -testObjectInherit(new Date(), false, false, false); -testObjectInherit(new Boolean(true), false, true, false); -testObjectInherit(new Array(), false, false, true); -testObjectInherit(new Error(), false, true, true); -testObjectInherit(testObjectInherit, false, true, true); -testObjectInherit(Math, true, true, true); +testObjectInherit(new String("test"), String, false, true, false); +testObjectInherit(/test/g, RegExp, false, true, true); +testObjectInherit(new Number(1), Number, false, false, false); +testObjectInherit(new Date(), Date, false, false, false); +testObjectInherit(new Boolean(true), Boolean, false, true, false); +testObjectInherit(new Array(), Array, false, false, true); +testObjectInherit(new Error(), Error, false, true, true); +testObjectInherit(testObjectInherit, Function, false, true, true); +testObjectInherit(Math, Object, true, true, true); function testFunctions(obj, arr) { var l; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b0e90fc..e3abe27 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -796,6 +796,21 @@ if (true) else ok(true, "else should be associated with nearest if statement"); +function instanceOfTest() {} +tmp = new instanceOfTest(); + +ok((tmp instanceof instanceOfTest) === true, "tmp is not instance of instanceOfTest"); +ok((tmp instanceof Object) === true, "tmp is not instance of Object"); +ok((tmp instanceof String) === false, "tmp is instance of String"); + +instanceOfTest.prototype = new Object(); +ok((tmp instanceof instanceOfTest) === false, "tmp is instance of instanceOfTest"); +ok((tmp instanceof Object) === true, "tmp is not instance of Object"); + +ok((1 instanceof Object) === false, "1 is instance of Object"); +ok((false instanceof Boolean) === false, "false is instance of Boolean"); +ok(("" instanceof Object) === false, "'' is instance of Object"); + ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); ok(isNaN(Infinity) === false, "isNaN(Infinity) !== false"); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 21eccc4..0afb180 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -842,6 +842,8 @@ static void run_tests(void) parse_script_a("function f() { var testPropGet; }"); + parse_script_a("ok((testObj instanceof Object) === false, 'testObj is instance of Object');"); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Get script_ctx_t as to_object arguments.
by Alexandre Julliard Aug. 29, 2009

Aug. 29, 2009

Module: wine Branch: master Commit: b71aaadbd25a3beba3a8cc443999dece04b38da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71aaadbd25a3beba3a8cc443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 23:54:32 2009 +0200 jscript: Get script_ctx_t as to_object arguments. --- dlls/jscript/engine.c | 6 +++--- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c9db8e6..8035e78 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1009,7 +1009,7 @@ HRESULT with_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t * if(FAILED(hres)) return hres; - hres = to_object(ctx, &val, &disp); + hres = to_object(ctx->parser->script, &val, &disp); VariantClear(&val); if(FAILED(hres)) return hres; @@ -1387,7 +1387,7 @@ HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, } if(SUCCEEDED(hres)) - hres = to_object(ctx, &member, &obj); + hres = to_object(ctx->parser->script, &member, &obj); VariantClear(&member); if(SUCCEEDED(hres)) { hres = to_string(ctx->parser->script, &val, ei, &str); @@ -1437,7 +1437,7 @@ HRESULT member_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags if(FAILED(hres)) return hres; - hres = to_object(ctx, &member, &obj); + hres = to_object(ctx->parser->script, &member, &obj); VariantClear(&member); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 807225a..01a6911 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -175,7 +175,7 @@ HRESULT to_integer(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_int32(script_ctx_t*,VARIANT*,jsexcept_t*,INT*); HRESULT to_uint32(script_ctx_t*,VARIANT*,jsexcept_t*,DWORD*); HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*); -HRESULT to_object(exec_ctx_t*,VARIANT*,IDispatch**); +HRESULT to_object(script_ctx_t*,VARIANT*,IDispatch**); typedef struct named_item_t { IDispatch *disp; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 10d4f51..a93fb65 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -571,14 +571,14 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) } /* ECMA-262 3rd Edition 9.9 */ -HRESULT to_object(exec_ctx_t *ctx, VARIANT *v, IDispatch **disp) +HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) { DispatchEx *dispex; HRESULT hres; switch(V_VT(v)) { case VT_BSTR: - hres = create_string(ctx->parser->script, V_BSTR(v), SysStringLen(V_BSTR(v)), &dispex); + hres = create_string(ctx, V_BSTR(v), SysStringLen(V_BSTR(v)), &dispex); if(FAILED(hres)) return hres; @@ -586,7 +586,7 @@ HRESULT to_object(exec_ctx_t *ctx, VARIANT *v, IDispatch **disp) break; case VT_I4: case VT_R8: - hres = create_number(ctx->parser->script, v, &dispex); + hres = create_number(ctx, v, &dispex); if(FAILED(hres)) return hres; @@ -597,7 +597,7 @@ HRESULT to_object(exec_ctx_t *ctx, VARIANT *v, IDispatch **disp) *disp = V_DISPATCH(v); break; case VT_BOOL: - hres = create_bool(ctx->parser->script, V_BOOL(v), &dispex); + hres = create_bool(ctx, V_BOOL(v), &dispex); if(FAILED(hres)) return hres;

1 0