September 2009 - Wine-Commits

Alexandre Julliard : ntdll: Avoid crashing on an empty resource directory.
by Alexandre Julliard Sept. 24, 2009

Sept. 24, 2009

Module: wine Branch: master Commit: 5b0fcb065e6c5d148ffefecbf162b8c4c285ee7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0fcb065e6c5d148ffefecbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 24 13:14:47 2009 +0200 ntdll: Avoid crashing on an empty resource directory. --- dlls/ntdll/resource.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index b9d2a6b..ff0a5d0 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -186,6 +186,7 @@ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, root = RtlImageDirectoryEntryToData( hmod, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size ); if (!root) return STATUS_RESOURCE_DATA_NOT_FOUND; + if (size < sizeof(*resdirptr)) return STATUS_RESOURCE_DATA_NOT_FOUND; resdirptr = root; if (!level--) goto done;

1 0

Alexandre Julliard : kernel32/tests: Fix a couple of failures in the comm tests.
by Alexandre Julliard Sept. 24, 2009

Sept. 24, 2009

Module: wine Branch: master Commit: b9251bcdbffdea95db8e5d7af16cee258ad32568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9251bcdbffdea95db8e5d7af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 24 13:10:54 2009 +0200 kernel32/tests: Fix a couple of failures in the comm tests. --- dlls/kernel32/tests/comm.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 3d0d17b..8cb010c 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -684,7 +684,7 @@ static HANDLE test_OpenComm(BOOL doOverlap) if (hcom == INVALID_HANDLE_VALUE) trace("Could not find a valid COM port. Skipping test_ReadTimeOut\n"); else - trace("Found Com port %s. Connected devices may disturbe results\n", port_name); + trace("Found Com port %s. Connected devices may disturb results\n", port_name); /*shown = TRUE; */ } if (hcom != INVALID_HANDLE_VALUE) @@ -692,9 +692,12 @@ static HANDLE test_OpenComm(BOOL doOverlap) BOOL ret; ret = ClearCommError(hcom, &errors, &comstat); - if (!ret && GetLastError() == ERROR_NOT_READY) + if (!ret && (GetLastError() == ERROR_NOT_READY || GetLastError() == ERROR_INVALID_HANDLE)) { - trace("%s doesn't respond, skipping the test\n", port_name); + if (GetLastError() == ERROR_NOT_READY) + trace("%s doesn't respond, skipping the test\n", port_name); + else + trace("%s is not a real serial port, skipping the test\n", port_name); CloseHandle(hcom); return INVALID_HANDLE_VALUE; } @@ -1649,7 +1652,8 @@ static void test_stdio(void) /* cygwin tries this to determine the stdin handle type */ ok( !GetCommState( GetStdHandle(STD_INPUT_HANDLE), &dcb ), "GetCommState succeeded on stdin\n" ); - ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_FUNCTION, + "got error %u\n", GetLastError() ); } START_TEST(comm)

1 0

Alexandre Julliard : kernel32: Cope with an empty resource section in UpdateResource.
by Alexandre Julliard Sept. 24, 2009

Sept. 24, 2009

Module: wine Branch: master Commit: 9f28d9a171c34552ba9040d5b499190af4225af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f28d9a171c34552ba9040d5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 24 13:10:39 2009 +0200 kernel32: Cope with an empty resource section in UpdateResource. --- dlls/kernel32/resource.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index f49ea24..9feb672 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1078,6 +1078,9 @@ static BOOL read_mapped_resources( QUEUEDUPDATES *updates, void *base, DWORD map TRACE("found .rsrc at %08x, size %08x\n", sec[i].PointerToRawData, sec[i].SizeOfRawData); + if (!sec[i].PointerToRawData || sec[i].SizeOfRawData < sizeof(IMAGE_RESOURCE_DIRECTORY)) + return TRUE; + root = (void*) ((BYTE*)base + sec[i].PointerToRawData); enumerate_mapped_resources( updates, base, mapping_size, root ); @@ -1404,13 +1407,6 @@ static IMAGE_SECTION_HEADER *get_resource_section( void *base, DWORD mapping_siz return NULL; } - /* check that the resources section is last */ - if (i != num_sections - 1) - { - FIXME(".rsrc isn't the last section\n"); - return NULL; - } - return &sec[i]; } @@ -1487,10 +1483,15 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) if (!sec) goto done; - if ((sec->SizeOfRawData + sec->PointerToRawData) != write_map->size) + if (!sec->PointerToRawData) /* empty section */ + { + sec->PointerToRawData = write_map->size; + sec->SizeOfRawData = 0; + } + else if ((sec->SizeOfRawData + sec->PointerToRawData) != write_map->size) { - FIXME(".rsrc isn't at the end of the image %08x + %08x != %08x\n", - sec->SizeOfRawData, sec->PointerToRawData, write_map->size); + FIXME(".rsrc isn't at the end of the image %08x + %08x != %08x for %s\n", + sec->SizeOfRawData, sec->PointerToRawData, write_map->size, debugstr_w(updates->pFileName)); goto done; }

1 0

Jacek Caban : jscript: Allow 'this' to be host object in invoke_value_proc.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 8717c388f89dfc46d968d1a9375332cc69351358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8717c388f89dfc46d968d1a93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:20:27 2009 +0200 jscript: Allow 'this' to be host object in invoke_value_proc. --- dlls/jscript/function.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 74c4e47..88bf9c3 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -257,21 +257,19 @@ static HRESULT invoke_constructor(script_ctx_t *ctx, FunctionInstance *function, static HRESULT invoke_value_proc(script_ctx_t *ctx, FunctionInstance *function, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - DispatchEx *this_obj = NULL; IDispatch *this_disp; vdisp_t vthis; HRESULT hres; this_disp = get_this(dp); if(this_disp) - this_obj = iface_to_jsdisp((IUnknown*)this_disp); + set_disp(&vthis, this_disp); + else + set_jsdisp(&vthis, ctx->script_disp); - set_jsdisp(&vthis, this_obj ? this_obj : ctx->script_disp); hres = function->value_proc(ctx, &vthis, flags, dp, retv, ei, caller); - vdisp_release(&vthis); - if(this_obj) - jsdisp_release(this_obj); + vdisp_release(&vthis); return hres; }

1 0

Jacek Caban : jscript: Throw correct error in get_length.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: bb4050d79280dc83e4f3159eb121cb88d84721e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4050d79280dc83e4f3159eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:24:11 2009 +0200 jscript: Throw correct error in get_length. --- dlls/jscript/array.c | 6 ++---- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 10 ++++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index b3dc780..1fa20fe 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -69,10 +69,8 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsexcept_t *ei, Dis return S_OK; } - if(!is_jsdisp(vdisp)) { - FIXME("Not JScript object\n"); - return E_FAIL; - } + if(!is_jsdisp(vdisp)) + return throw_type_error(ctx, ei, IDS_JSCRIPT_EXPECTED, NULL); hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &var, ei, NULL/*FIXME*/); if(FAILED(hres)) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index b7f8744..79921b4 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -38,6 +38,7 @@ STRINGTABLE DISCARDABLE IDS_ILLEGAL_ASSIGN "Illegal assignment" IDS_UNDEFINED "'|' is undefined" IDS_NOT_BOOL "Boolean object expected" + IDS_JSCRIPT_EXPECTED "JScript object expected" IDS_REGEXP_SYNTAX_ERROR "Syntax error in regular expression" IDS_INVALID_LENGTH "Array length must be a finite positive integer" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 9e33ebc..81cd74d 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -34,5 +34,6 @@ #define IDS_ILLEGAL_ASSIGN 0x1390 #define IDS_UNDEFINED 0x1391 #define IDS_NOT_BOOL 0x1392 +#define IDS_JSCRIPT_EXPECTED 0x1396 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 #define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ee3a058..1c2f56b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1621,6 +1621,16 @@ exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); exception_test(function() {eval("nonexistingfunc()")}, "TypeError", -2146823281); exception_test(function() {RegExp(/a/, "g");}, "RegExpError", -2146823271); +function testArrayHostThis(func) { + exception_test(function() { Array.prototype[func].call(testObj); }, "TypeError", -2146823274); +} + +testArrayHostThis("push"); +testArrayHostThis("shift"); +testArrayHostThis("slice"); +testArrayHostThis("splice"); +testArrayHostThis("unshift"); + 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");

1 0

Jacek Caban : jscript: Added Object. toString for host objects implementation.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 461180459b7a077fbdd617b51b3d0641863e5921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461180459b7a077fbdd617b51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:19:58 2009 +0200 jscript: Added Object.toString for host objects implementation. --- dlls/jscript/object.c | 11 ++++++++--- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 7dffff7..f5bc455 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -36,6 +36,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DispatchEx *jsdisp; + const WCHAR *str; static const WCHAR formatW[] = {'[','o','b','j','e','c','t',' ','%','s',']',0}; @@ -56,18 +57,22 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D TRACE("\n"); jsdisp = get_jsdisp(jsthis); - if(!jsdisp || names[jsdisp->builtin_info->class] == NULL) { + if(!jsdisp) { + str = objectW; + }else if(names[jsdisp->builtin_info->class]) { + str = names[jsdisp->builtin_info->class]; + }else { FIXME("jdisp->builtin_info->class = %d\n", jsdisp->builtin_info->class); return E_FAIL; } if(retv) { V_VT(retv) = VT_BSTR; - V_BSTR(retv) = SysAllocStringLen(NULL, 9+strlenW(names[jsdisp->builtin_info->class])); + V_BSTR(retv) = SysAllocStringLen(NULL, 9+strlenW(str)); if(!V_BSTR(retv)) return E_OUTOFMEMORY; - sprintfW(V_BSTR(retv), formatW, names[jsdisp->builtin_info->class]); + sprintfW(V_BSTR(retv), formatW, str); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7b22212..ee3a058 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -87,6 +87,8 @@ ok(tmp.f() === "[object Number]", "tmp.f() = " + tmp.f()); ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); (tmp = new String).f = Object.prototype.toString; ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); +tmp = Object.prototype.toString.call(testObj); +ok(tmp === "[object Object]", "'' + new Object() = " + tmp); ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String");

1 0

Jacek Caban : jscript: Allow this_obj to be host object in call_function.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 37c2d43e28ec5f3188dbdf2c0866dbf1b41315b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c2d43e28ec5f3188dbdf2c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:19:29 2009 +0200 jscript: Allow this_obj to be host object in call_function. --- dlls/jscript/function.c | 14 ++++---------- dlls/jscript/tests/run.c | 4 ++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index e68222b..74c4e47 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -281,21 +281,15 @@ static HRESULT call_function(script_ctx_t *ctx, FunctionInstance *function, IDis HRESULT hres; if(function->value_proc) { - DispatchEx *jsthis = NULL; vdisp_t vthis; - if(this_obj) { - jsthis = iface_to_jsdisp((IUnknown*)this_obj); - if(!jsthis) - FIXME("this_obj is not DispatchEx\n"); - } + if(this_obj) + set_disp(&vthis, this_obj); + else + set_jsdisp(&vthis, ctx->script_disp); - set_jsdisp(&vthis, jsthis ? jsthis : ctx->script_disp); hres = function->value_proc(ctx, &vthis, DISPATCH_METHOD, args, retv, ei, caller); vdisp_release(&vthis); - - if(jsthis) - jsdisp_release(jsthis); }else { hres = invoke_source(ctx, function, this_obj ? this_obj : (IDispatch*)_IDispatchEx_(ctx->script_disp), args, retv, ei, caller); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 786624c..1cfee4f 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -912,6 +912,10 @@ static void run_tests(void) parse_script_a("ok(String(testObj) === '1', 'wrong testObj value');"); CHECK_CALLED(testobj_value); + SET_EXPECT(testobj_value); + parse_script_a("ok(String.prototype.concat.call(testObj, ' OK') === '1 OK', 'wrong concat result');"); + CHECK_CALLED(testobj_value); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Allow 'this' to be host object in builtin functions.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: f8c2b42de44eafe53f2f39afbe9d8289310b10e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c2b42de44eafe53f2f39afb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:18:39 2009 +0200 jscript: Allow 'this' to be host object in builtin functions. --- dlls/jscript/array.c | 248 +++++++++++++------------ dlls/jscript/bool.c | 24 ++- dlls/jscript/date.c | 311 +++++++++++++++---------------- dlls/jscript/dispex.c | 37 +++- dlls/jscript/error.c | 37 ++-- dlls/jscript/function.c | 55 +++--- dlls/jscript/global.c | 68 ++++---- dlls/jscript/jscript.h | 78 ++++++++- dlls/jscript/math.c | 52 +++--- dlls/jscript/number.c | 41 +++-- dlls/jscript/object.c | 39 +++-- dlls/jscript/regexp.c | 39 +++-- dlls/jscript/string.c | 480 +++++++++++++++-------------------------------- 13 files changed, 736 insertions(+), 773 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8c2b42de44eafe53f2f3…

1 0

Jacek Caban : jscript: Avoid using dispex->ctx.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 5dcd182e8f9052e719c58372caba76ac57e4e4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcd182e8f9052e719c58372c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:17:17 2009 +0200 jscript: Avoid using dispex->ctx. --- dlls/jscript/bool.c | 8 ++-- dlls/jscript/engine.c | 4 +- dlls/jscript/error.c | 38 ++++++--------- dlls/jscript/global.c | 52 ++++++++++---------- dlls/jscript/jscript.h | 4 +- dlls/jscript/math.c | 42 ++++++++-------- dlls/jscript/number.c | 18 +++--- dlls/jscript/object.c | 6 +- dlls/jscript/regexp.c | 36 +++++++------- dlls/jscript/string.c | 130 ++++++++++++++++++++++++------------------------ 10 files changed, 165 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5dcd182e8f9052e719c58…

1 0

Jacek Caban : jscript: Don't use dispex->ctx in function.c.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: a9dc89a3e1647f41aff3bc64637e2fd66822baa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9dc89a3e1647f41aff3bc646… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:16:43 2009 +0200 jscript: Don't use dispex->ctx in function.c. --- dlls/jscript/function.c | 57 +++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 7d4be89..bd7c99b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -147,7 +147,7 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS return S_OK; } -static HRESULT create_var_disp(FunctionInstance *function, DISPPARAMS *dp, jsexcept_t *ei, +static HRESULT create_var_disp(script_ctx_t *ctx, FunctionInstance *function, DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller, DispatchEx **ret) { DispatchEx *var_disp, *arg_disp; @@ -155,11 +155,11 @@ static HRESULT create_var_disp(FunctionInstance *function, DISPPARAMS *dp, jsexc static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; - hres = create_dispex(function->dispex.ctx, NULL, NULL, &var_disp); + hres = create_dispex(ctx, NULL, NULL, &var_disp); if(FAILED(hres)) return hres; - hres = create_arguments(function->dispex.ctx, (IDispatch*)_IDispatchEx_(&function->dispex), + hres = create_arguments(ctx, (IDispatch*)_IDispatchEx_(&function->dispex), dp, ei, caller, &arg_disp); if(SUCCEEDED(hres)) { VARIANT var; @@ -181,7 +181,7 @@ static HRESULT create_var_disp(FunctionInstance *function, DISPPARAMS *dp, jsexc return S_OK; } -static HRESULT invoke_source(FunctionInstance *function, IDispatch *this_obj, DISPPARAMS *dp, +static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_obj, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *var_disp; @@ -194,7 +194,7 @@ static HRESULT invoke_source(FunctionInstance *function, IDispatch *this_obj, DI return E_FAIL; } - hres = create_var_disp(function, dp, ei, caller, &var_disp); + hres = create_var_disp(ctx, function, dp, ei, caller, &var_disp); if(FAILED(hres)) return hres; @@ -212,28 +212,28 @@ static HRESULT invoke_source(FunctionInstance *function, IDispatch *this_obj, DI return hres; } -static HRESULT invoke_function(FunctionInstance *function, DISPPARAMS *dp, +static HRESULT invoke_function(script_ctx_t *ctx, FunctionInstance *function, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { IDispatch *this_obj; if(!(this_obj = get_this(dp))) - this_obj = (IDispatch*)_IDispatchEx_(function->dispex.ctx->script_disp); + this_obj = (IDispatch*)_IDispatchEx_(ctx->script_disp); - return invoke_source(function, this_obj, dp, retv, ei, caller); + return invoke_source(ctx, function, this_obj, dp, retv, ei, caller); } -static HRESULT invoke_constructor(FunctionInstance *function, DISPPARAMS *dp, +static HRESULT invoke_constructor(script_ctx_t *ctx, FunctionInstance *function, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *this_obj; HRESULT hres; - hres = create_object(function->dispex.ctx, &function->dispex, &this_obj); + hres = create_object(ctx, &function->dispex, &this_obj); if(FAILED(hres)) return hres; - hres = invoke_source(function, (IDispatch*)_IDispatchEx_(this_obj), dp, retv, ei, caller); + hres = invoke_source(ctx, function, (IDispatch*)_IDispatchEx_(this_obj), dp, retv, ei, caller); if(FAILED(hres)) { jsdisp_release(this_obj); return hres; @@ -244,7 +244,7 @@ static HRESULT invoke_constructor(FunctionInstance *function, DISPPARAMS *dp, return S_OK; } -static HRESULT invoke_value_proc(FunctionInstance *function, WORD flags, DISPPARAMS *dp, +static HRESULT invoke_value_proc(script_ctx_t *ctx, FunctionInstance *function, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *this_obj = NULL; @@ -255,7 +255,7 @@ static HRESULT invoke_value_proc(FunctionInstance *function, WORD flags, DISPPAR if(this_disp) this_obj = iface_to_jsdisp((IUnknown*)this_disp); - hres = function->value_proc(function->dispex.ctx, this_obj ? this_obj : function->dispex.ctx->script_disp, + hres = function->value_proc(ctx, this_obj ? this_obj : ctx->script_disp, flags, dp, retv, ei, caller); if(this_obj) @@ -263,7 +263,7 @@ static HRESULT invoke_value_proc(FunctionInstance *function, WORD flags, DISPPAR return hres; } -static HRESULT call_function(FunctionInstance *function, IDispatch *this_obj, DISPPARAMS *args, +static HRESULT call_function(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_obj, DISPPARAMS *args, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { HRESULT hres; @@ -277,14 +277,13 @@ static HRESULT call_function(FunctionInstance *function, IDispatch *this_obj, DI FIXME("this_obj is not DispatchEx\n"); } - hres = function->value_proc(function->dispex.ctx, jsthis ? jsthis : function->dispex.ctx->script_disp, + hres = function->value_proc(ctx, jsthis ? jsthis : ctx->script_disp, 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), + hres = invoke_source(ctx, function, this_obj ? this_obj : (IDispatch*)_IDispatchEx_(ctx->script_disp), args, retv, ei, caller); } @@ -350,7 +349,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD fla TRACE("\n"); if(!is_class(dispex, JSCLASS_FUNCTION)) - return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); + return throw_type_error(ctx, ei, IDS_NOT_FUNC, NULL); function = (FunctionInstance*)dispex; @@ -367,7 +366,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD fla return S_OK; } -static HRESULT array_to_args(DispatchEx *arg_array, jsexcept_t *ei, IServiceProvider *caller, +static HRESULT array_to_args(script_ctx_t *ctx, DispatchEx *arg_array, jsexcept_t *ei, IServiceProvider *caller, DISPPARAMS *args) { VARIANT var, *argv; @@ -378,7 +377,7 @@ static HRESULT array_to_args(DispatchEx *arg_array, jsexcept_t *ei, IServiceProv if(FAILED(hres)) return hres; - hres = to_uint32(arg_array->ctx, &var, ei, &length); + hres = to_uint32(ctx, &var, ei, &length); VariantClear(&var); if(FAILED(hres)) return hres; @@ -422,7 +421,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, argc = arg_cnt(dp); if(argc) { - hres = to_object(dispex->ctx, get_arg(dp,0), &this_obj); + hres = to_object(ctx, get_arg(dp,0), &this_obj); if(FAILED(hres)) return hres; } @@ -440,7 +439,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, } if(arg_array) { - hres = array_to_args(arg_array, ei, caller, &args); + hres = array_to_args(ctx, arg_array, ei, caller, &args); jsdisp_release(arg_array); }else { FIXME("throw TypeError\n"); @@ -448,7 +447,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, } } - hres = call_function(function, this_obj, &args, retv, ei, caller); + hres = call_function(ctx, function, this_obj, &args, retv, ei, caller); if(this_obj) IDispatch_Release(this_obj); @@ -478,7 +477,7 @@ static HRESULT Function_call(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, argc = arg_cnt(dp); if(argc) { - hres = to_object(dispex->ctx, get_arg(dp,0), &this_obj); + hres = to_object(ctx, get_arg(dp,0), &this_obj); if(FAILED(hres)) return hres; args.cArgs = argc-1; @@ -487,7 +486,7 @@ static HRESULT Function_call(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, if(args.cArgs) args.rgvarg = dp->rgvarg + dp->cArgs - args.cArgs-1; - hres = call_function(function, this_obj, &args, retv, ei, caller); + hres = call_function(ctx, function, this_obj, &args, retv, ei, caller); if(this_obj) IDispatch_Release(this_obj); @@ -511,9 +510,9 @@ HRESULT Function_value(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPA switch(flags) { case DISPATCH_METHOD: if(function->value_proc) - return invoke_value_proc(function, flags, dp, retv, ei, caller); + return invoke_value_proc(ctx, function, flags, dp, retv, ei, caller); - return invoke_function(function, dp, retv, ei, caller); + return invoke_function(ctx, function, dp, retv, ei, caller); case DISPATCH_PROPERTYGET: { HRESULT hres; @@ -530,9 +529,9 @@ HRESULT Function_value(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPA case DISPATCH_CONSTRUCT: if(function->value_proc) - return invoke_value_proc(function, flags, dp, retv, ei, caller); + return invoke_value_proc(ctx, function, flags, dp, retv, ei, caller); - return invoke_constructor(function, dp, retv, ei, caller); + return invoke_constructor(ctx, function, dp, retv, ei, caller); default: FIXME("not implemented flags %x\n", flags);

1 0