September 2011 - Wine-Commits

Stefan Dösinger : ddraw/tests: Mark a strange radeon X1600 Windows behavior broken.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 95b7cda6be6896e4084a264aba4c8dfd0536dbeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b7cda6be6896e4084a264ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:49:21 2011 +0200 ddraw/tests: Mark a strange radeon X1600 Windows behavior broken. --- dlls/ddraw/tests/d3d.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index dee6f05..54ff598 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4401,8 +4401,12 @@ static HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) if (U1(*fmt).dwZBufferBitDepth == 24) expected_pitch = ddsd.dwWidth * 4; else expected_pitch = ddsd.dwWidth * U1(*fmt).dwZBufferBitDepth / 8; - /* Some formats(16 bit depth without stencil) return pitch 0 */ - if (U1(ddsd).lPitch != 0 && U1(ddsd).lPitch != expected_pitch) + /* Some formats(16 bit depth without stencil) return pitch 0 + * + * The Radeon X1600 Catalyst 10.2 Windows XP driver returns an otherwise sane + * pitch with an extra 128 bytes, regardless of the format and width */ + if (U1(ddsd).lPitch != 0 && U1(ddsd).lPitch != expected_pitch + && !broken(U1(ddsd).lPitch == expected_pitch + 128)) { ok(0, "Z buffer pitch is %u, expected %u\n", U1(ddsd).lPitch, expected_pitch); dump_format(fmt);

1 0

Jacek Caban : jscript: Removed useless undef ACTSCPSITE_THIS.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: c46c47cbf31621ec61fb7ec672c2b95cc40ccf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46c47cbf31621ec61fb7ec67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:46:43 2011 +0200 jscript: Removed useless undef ACTSCPSITE_THIS. --- dlls/jscript/tests/jscript.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index eda867d..152329b 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -189,8 +189,6 @@ static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) return S_OK; } -#undef ACTSCPSITE_THIS - static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_QueryInterface, ActiveScriptSite_AddRef,

1 0

Jacek Caban : vbscript: Added interp_me implementation.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: afffa2c58cd6d41cb0a064a18c5d3614a1c7ea54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afffa2c58cd6d41cb0a064a18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:10:08 2011 +0200 vbscript: Added interp_me implementation. --- dlls/vbscript/interp.c | 10 ++++++++-- dlls/vbscript/tests/lang.vbs | 10 ++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 831a39d..16feabe 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -710,8 +710,14 @@ static HRESULT interp_stop(exec_ctx_t *ctx) static HRESULT interp_me(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + + TRACE("\n"); + + IDispatch_AddRef(ctx->this_obj); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = ctx->this_obj; + return stack_push(ctx, &v); } static HRESULT interp_bool(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2b33a2d..922fc6a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -620,6 +620,16 @@ Call ok(not (x is Nothing), "x is 1") Call ok(Nothing is Nothing, "Nothing is not Nothing") Call ok(x is obj and true, "x is obj and true is false") +Class TestMe + Public Sub Test(MyMe) + Call ok(Me is MyMe, "Me is not MyMe") + End Sub +End Class + +Set obj = New TestMe +Call obj.test(obj) + Call ok(getVT(test) = "VT_DISPATCH", "getVT(test) = " & getVT(test)) +Call ok(Me is Test, "Me is not Test") reportSuccess()

1 0

Jacek Caban : vbscript: Added ME expression parser implementation.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: eef966faf77a6ba8b533aec8bf4c54d1a33d34cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef966faf77a6ba8b533aec8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:09:57 2011 +0200 vbscript: Added ME expression parser implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/vbscript.h | 1 + 5 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 1102378..b2c0cc1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -405,6 +405,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lt); case EXPR_LTEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lteq); + case EXPR_ME: + return push_instr(ctx, OP_me) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 0593a86..831a39d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -708,6 +708,12 @@ static HRESULT interp_stop(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_me(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_bool(exec_ctx_t *ctx) { const VARIANT_BOOL arg = ctx->instr->arg1.lng; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index b61582b..bff48bb 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -34,6 +34,7 @@ typedef enum { EXPR_IS, EXPR_LT, EXPR_LTEQ, + EXPR_ME, EXPR_MEMBER, EXPR_MOD, EXPR_MUL, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index f25d825..a3fb134 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -307,6 +307,7 @@ LiteralExpression PrimaryExpression : '(' Expression ')' { $$ = $2; } + | tME { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; } ClassDeclaration : tCLASS tIdentifier tNL ClassBody tEND tCLASS tNL { $4->name = $2; $$ = $4; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index dc842cf..a1e07b9 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -203,6 +203,7 @@ typedef enum { X(lteq, 1, 0, 0) \ X(mcall, 1, ARG_BSTR, ARG_UINT) \ X(mcallv, 1, ARG_BSTR, ARG_UINT) \ + X(me, 1, 0, 0) \ X(mod, 1, 0, 0) \ X(mul, 1, 0, 0) \ X(neg, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added isObject tests.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 1b854ba0c4917356e27fba80afc13e73f4e7aa87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b854ba0c4917356e27fba80a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:08:57 2011 +0200 vbscript: Added isObject tests. --- dlls/vbscript/tests/api.vbs | 35 +++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/rsrc.rc | 3 +++ dlls/vbscript/tests/run.c | 1 + 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs new file mode 100644 index 0000000..2b2cf64 --- /dev/null +++ b/dlls/vbscript/tests/api.vbs @@ -0,0 +1,35 @@ +' +' Copyright 2011 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 +' + +Option Explicit + +Dim x + +Class EmptyClass +End Class + +Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") +Set x = new EmptyClass +Call ok(isObject(x), "isObject(x) is not true?") +Call ok(isObject(Nothing), "isObject(Nothing) is not true?") +Call ok(not isObject(true), "isObject(true) is true?") +Call ok(not isObject(4), "isObject(4) is true?") +Call ok(not isObject("x"), "isObject(""x"") is true?") +Call ok(not isObject(Null), "isObject(Null) is true?") + +Call reportSuccess() diff --git a/dlls/vbscript/tests/rsrc.rc b/dlls/vbscript/tests/rsrc.rc index 834df1d..0ca68d4 100644 --- a/dlls/vbscript/tests/rsrc.rc +++ b/dlls/vbscript/tests/rsrc.rc @@ -16,5 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: api.vbs */ +api.vbs 40 "api.vbs" + /* @makedep: lang.vbs */ lang.vbs 40 "lang.vbs" diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9aba091..b631c88 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1098,6 +1098,7 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_i); run_from_res("lang.vbs"); + run_from_res("api.vbs"); test_gc(); }

1 0

Jacek Caban : vbscript: Added global object' s isObject function stub implementation.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 4e9d29907cd682bd7c854fda203cfbdb4271a595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9d29907cd682bd7c854fda2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:08:38 2011 +0200 vbscript: Added global object's isObject function stub implementation. --- .gitignore | 1 + dlls/vbscript/Makefile.in | 7 ++++- dlls/vbscript/compile.c | 15 +++++++-- dlls/vbscript/global.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 8 +++++ dlls/vbscript/vbdisp.c | 58 +++++++++++++++++++++++++++++++++---- dlls/vbscript/vbscript.c | 2 + dlls/vbscript/vbscript.h | 40 ++++++++++++++++++++++++- dlls/vbscript/vbscript_main.c | 63 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 239 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e9d29907cd682bd7c854…

1 0

Jacek Caban : vbscript: Added error object stub implementation.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 13d8e7b85329ab99d87bfa690ea2bfa5337f7149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d8e7b85329ab99d87bfa690… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:09:21 2011 +0200 vbscript: Added error object stub implementation. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/error.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/vbscript/global.c | 2 +- dlls/vbscript/interp.c | 27 ++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/vbscript.c | 2 ++ dlls/vbscript/vbscript.h | 4 ++++ 7 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index e1a8382..2da0c33 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = oleaut32 C_SRCS = \ compile.c \ + error.c \ global.c \ interp.c \ lex.c \ diff --git a/dlls/vbscript/error.c b/dlls/vbscript/error.c new file mode 100644 index 0000000..5d7efd0 --- /dev/null +++ b/dlls/vbscript/error.c @@ -0,0 +1,37 @@ +/* + * Copyright 2011 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 "vbscript.h" +#include "vbscript_defs.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +HRESULT init_err(script_ctx_t *ctx) +{ + HRESULT hres; + + ctx->err_desc.ctx = ctx; + + hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); + if(FAILED(hres)) + return hres; + + return create_vbdisp(&ctx->err_desc, &ctx->err_obj); +} diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9876208..3d58ea7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1399,5 +1399,5 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - return S_OK; + return init_err(ctx); } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7c3df7d..306c2a2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -48,6 +48,7 @@ typedef enum { REF_NONE, REF_DISP, REF_VAR, + REF_OBJ, REF_FUNC } ref_type_t; @@ -60,6 +61,7 @@ typedef struct { } d; VARIANT *v; function_t *f; + IDispatch *obj; } u; } ref_t; @@ -92,6 +94,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; + static const WCHAR errW[] = {'e','r','r',0}; + if(invoke_type == VBDISP_LET && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) && !strcmpiW(name, ctx->func->name)) { @@ -147,6 +151,12 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + if(!strcmpiW(name, errW)) { + ref->type = REF_OBJ; + ref->u.obj = (IDispatch*)&ctx->script->err_obj->IDispatchEx_iface; + return S_OK; + } + hres = vbdisp_get_id(ctx->script->global_obj, name, invoke_type, TRUE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; @@ -291,8 +301,8 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) { BSTR identifier = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; - ref_t ref = {0}; DISPPARAMS dp; + ref_t ref; HRESULT hres; hres = lookup_identifier(ctx, identifier, VBDISP_CALLGET, &ref); @@ -326,6 +336,18 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) if(FAILED(hres)) return hres; break; + case REF_OBJ: + if(arg_cnt) { + FIXME("arguments on object\n"); + return E_NOTIMPL; + } + + if(res) { + IDispatch_AddRef(ref.u.obj); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = ref.u.obj; + } + break; case REF_NONE: FIXME("%s not found\n", debugstr_w(identifier)); return DISP_E_UNKNOWNNAME; @@ -440,6 +462,9 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v case REF_FUNC: FIXME("functions not implemented\n"); return E_NOTIMPL; + case REF_OBJ: + FIXME("REF_OBJ\n"); + return E_NOTIMPL; case REF_NONE: FIXME("%s not found\n", debugstr_w(name)); if(own_val) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2b2cf64..3b92803 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -32,4 +32,6 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 9b61b93..c9fa3d0 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -131,6 +131,8 @@ static void destroy_script(script_ctx_t *ctx) IDispatch_Release(ctx->host_global); if(ctx->site) IActiveScriptSite_Release(ctx->site); + if(ctx->err_obj) + IDispatchEx_Release(&ctx->err_obj->IDispatchEx_iface); if(ctx->global_obj) IDispatchEx_Release(&ctx->global_obj->IDispatchEx_iface); if(ctx->script_obj) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5bd7ff9..dc842cf 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -150,6 +150,9 @@ struct _script_ctx_t { class_desc_t global_desc; vbdisp_t *global_obj; + class_desc_t err_desc; + vbdisp_t *err_obj; + dynamic_var_t *global_vars; function_t *global_funcs; class_desc_t *classes; @@ -160,6 +163,7 @@ struct _script_ctx_t { }; HRESULT init_global(script_ctx_t*); +HRESULT init_err(script_ctx_t*); typedef enum { ARG_NONE = 0,

1 0

Jacek Caban : vbscript: Added interp_lt implementation.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: ac5db68d02b2cbc1e7f7bd3c69424ffab206a6cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5db68d02b2cbc1e7f7bd3c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:07:39 2011 +0200 vbscript: Added interp_lt implementation. --- dlls/vbscript/interp.c | 14 ++++++++++++-- dlls/vbscript/tests/lang.vbs | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9f1ed2d..a609056 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -975,8 +975,18 @@ static HRESULT interp_gteq(exec_ctx_t *ctx) static HRESULT interp_lt(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = cmp_oper(ctx); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = hres == VARCMP_LT ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); } static HRESULT interp_lteq(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 76ff346..699d78c 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -124,6 +124,8 @@ Call ok(false > true, "! false < true") Call ok(0 > true, "! 0 > true") Call ok(not (true > 0), "true > 0") Call ok(not (0 > 1 = 1), "0 > 1 = 1") +Call ok(1 < 2, "! 1 < 2") +Call ok(1 = 1 < 0, "! 1 = 1 < 0") x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2))

1 0

Jacek Caban : vbscript: Added more global object stubs.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 32a7a81257c1ebb5ab95e744f8ba9748d44e9c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a7a81257c1ebb5ab95e744f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:09:08 2011 +0200 vbscript: Added more global object stubs. --- dlls/vbscript/global.c | 1339 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1338 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32a7a81257c1ebb5ab95e…

1 0

Jacek Caban : vbscript: Added error object functions stubs.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 347cf1d39df2c5e3488d10e9aff267861f14f5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347cf1d39df2c5e3488d10e9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:09:32 2011 +0200 vbscript: Added error object functions stubs. --- dlls/vbscript/error.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/error.c b/dlls/vbscript/error.c index 5d7efd0..9739ba7 100644 --- a/dlls/vbscript/error.c +++ b/dlls/vbscript/error.c @@ -23,11 +23,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_HelpContext(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t err_props[] = { + {DISPID_ERR_DESCRIPTION, Err_Description, BP_GETPUT}, + {DISPID_ERR_HELPCONTEXT, Err_HelpContext, BP_GETPUT}, + {DISPID_ERR_HELPFILE, Err_HelpFile, BP_GETPUT}, + {DISPID_ERR_NUMBER, Err_Number, BP_GETPUT}, + {DISPID_ERR_SOURCE, Err_Source, BP_GETPUT}, + {DISPID_ERR_CLEAR, Err_Clear}, + {DISPID_ERR_RAISE, Err_Raise, 0, 5}, +}; + HRESULT init_err(script_ctx_t *ctx) { HRESULT hres; ctx->err_desc.ctx = ctx; + ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); + ctx->err_desc.builtin_props = err_props; hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); if(FAILED(hres))

1 0