September 2011 - Wine-Commits

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

Sept. 19, 2011

Module: wine Branch: master Commit: 4df350bb221d31f3fdd6bda5eab872304441ca29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df350bb221d31f3fdd6bda5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:07:31 2011 +0200 vbscript: Added interp_gt implementation. --- dlls/vbscript/interp.c | 14 ++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e35a481..9f1ed2d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -943,8 +943,18 @@ static HRESULT interp_nequal(exec_ctx_t *ctx) static HRESULT interp_gt(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_GT ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); } static HRESULT interp_gteq(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 149c4a4..76ff346 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -119,6 +119,11 @@ call ok(false imp null, "false imp null is false?") Call ok(2 >= 1, "! 2 >= 1") Call ok(2 >= 2, "! 2 >= 2") Call ok(not(true >= 2), "true >= 2 ?") +Call ok(2 > 1, "! 2 > 1") +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") x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2))

1 0

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

Sept. 19, 2011

Module: wine Branch: master Commit: 33a81218adc851966427b50f0c770751c9d33ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a81218adc851966427b50f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:07:51 2011 +0200 vbscript: Added interp_lteq 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 a609056..d3c3483 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -991,8 +991,18 @@ static HRESULT interp_lt(exec_ctx_t *ctx) static HRESULT interp_lteq(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 || hres == VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); } static HRESULT interp_concat(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 699d78c..a63f9cf 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -126,6 +126,8 @@ 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") +Call ok(1 <= 2, "! 1 <= 2") +Call ok(2 <= 2, "! 2 <= 2") x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2))

1 0

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

Sept. 19, 2011

Module: wine Branch: master Commit: bce6d6ac8a4912b8a8794a783adf9023436c9535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce6d6ac8a4912b8a8794a783… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:07:22 2011 +0200 vbscript: Added interp_gteq implementation. --- dlls/vbscript/interp.c | 14 ++++++++++++-- dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9a49396..e35a481 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -949,8 +949,18 @@ static HRESULT interp_gt(exec_ctx_t *ctx) static HRESULT interp_gteq(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_GT || hres == VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); } static HRESULT interp_lt(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c62f17f..149c4a4 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -116,6 +116,10 @@ call ok(false imp false, "false does not imp false?") call ok(not (true imp false), "true imp false?") call ok(false imp null, "false imp null is false?") +Call ok(2 >= 1, "! 2 >= 1") +Call ok(2 >= 2, "! 2 >= 2") +Call ok(not(true >= 2), "true >= 2 ?") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

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

Sept. 19, 2011

Module: wine Branch: master Commit: 2de6982f46f20895b5f82e9ee602a905f68aa1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de6982f46f20895b5f82e9ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:08:02 2011 +0200 vbscript: Added is expression implementation. --- dlls/vbscript/compile.c | 2 + dlls/vbscript/interp.c | 71 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 12 +++++++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c939aea..df08c24 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -387,6 +387,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gteq); case EXPR_IDIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_idiv); + case EXPR_IS: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_is); case EXPR_IMP: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_imp); case EXPR_LT: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d3c3483..472d23c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1005,6 +1005,77 @@ static HRESULT interp_lteq(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, VARIANT_BOOL *ret) +{ + IObjectIdentity *identity; + IUnknown *unk1, *unk2; + HRESULT hres; + + if(disp1 == disp2) { + *ret = VARIANT_TRUE; + return S_OK; + } + + if(!disp1 || !disp2) { + *ret = VARIANT_FALSE; + return S_OK; + } + + hres = IDispatch_QueryInterface(disp1, &IID_IUnknown, (void**)&unk1); + if(FAILED(hres)) + return hres; + + hres = IDispatch_QueryInterface(disp2, &IID_IUnknown, (void**)&unk2); + if(FAILED(hres)) { + IUnknown_Release(unk1); + return hres; + } + + if(unk1 == unk2) { + *ret = VARIANT_TRUE; + }else { + hres = IUnknown_QueryInterface(unk1, &IID_IObjectIdentity, (void**)&identity); + if(SUCCEEDED(hres)) { + hres = IObjectIdentity_IsEqualObject(identity, unk2); + IObjectIdentity_Release(identity); + *ret = hres == S_OK ? VARIANT_TRUE : VARIANT_FALSE; + }else { + *ret = VARIANT_FALSE; + } + } + + IUnknown_Release(unk1); + IUnknown_Release(unk2); + return S_OK; +} + +static HRESULT interp_is(exec_ctx_t *ctx) +{ + IDispatch *l, *r; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_disp(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_disp(ctx, &l); + if(SUCCEEDED(hres)) { + V_VT(&v) = VT_BOOL; + hres = disp_cmp(l, r, &V_BOOL(&v)); + if(l) + IDispatch_Release(l); + } + if(r) + IDispatch_Release(r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + static HRESULT interp_concat(exec_ctx_t *ctx) { variant_val_t r, l; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ef7f139..b61582b 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -31,6 +31,7 @@ typedef enum { EXPR_GTEQ, EXPR_IDIV, EXPR_IMP, + EXPR_IS, EXPR_LT, EXPR_LTEQ, EXPR_MEMBER, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d0c3f70..f25d825 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -252,6 +252,7 @@ EqualityExpression | EqualityExpression '<' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_LT, $1, $3); CHECK_ERROR; } | EqualityExpression tGTEQ ConcatExpression { $$ = new_binary_expression(ctx, EXPR_GTEQ, $1, $3); CHECK_ERROR; } | EqualityExpression tLTEQ ConcatExpression { $$ = new_binary_expression(ctx, EXPR_LTEQ, $1, $3); CHECK_ERROR; } + | EqualityExpression tIS ConcatExpression { $$ = new_binary_expression(ctx, EXPR_IS, $1, $3); CHECK_ERROR; } ConcatExpression : AdditiveExpression { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a63f9cf..64230dc 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -608,4 +608,16 @@ funcCalled = "" Set obj = Nothing Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled) +Set obj = new EmptyClass +Set x = obj +Set y = new EmptyClass + +Call ok(obj is x, "obj is not x") +Call ok(x is obj, "x is not obj") +Call ok(not (obj is y), "obj is not y") +Call ok(not obj is y, "obj is not y") +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") + reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c73f11d..6083511 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -167,6 +167,7 @@ typedef enum { X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \ X(imp, 1, 0, 0) \ + X(is, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(jmp_true, 0, ARG_ADDR, 0) \

1 0

Jacek Caban : vbscript: Store reference to collected object in collect_objects.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 79a2650de7a9e04430a523f2a8d9b262acca0f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a2650de7a9e04430a523f2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:08:15 2011 +0200 vbscript: Store reference to collected object in collect_objects. --- dlls/vbscript/vbdisp.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 14fb8b0..19a511e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -123,21 +123,21 @@ static HRESULT invoke_variant_prop(vbdisp_t *This, VARIANT *v, WORD flags, DISPP return hres; } -static void run_terminator(vbdisp_t *This) +static BOOL run_terminator(vbdisp_t *This) { + DISPPARAMS dp = {0}; + if(This->terminator_ran) - return; + return TRUE; This->terminator_ran = TRUE; - if(This->desc->class_terminate_id) { - DISPPARAMS dp = {0}; - - This->ref++; - exec_script(This->desc->ctx, This->desc->funcs[This->desc->class_terminate_id].entries[VBDISP_CALLGET], - (IDispatch*)&This->IDispatchEx_iface, &dp, NULL); - This->ref--; - } + if(!This->desc->class_terminate_id) + return TRUE; + This->ref++; + exec_script(This->desc->ctx, This->desc->funcs[This->desc->class_terminate_id].entries[VBDISP_CALLGET], + (IDispatch*)&This->IDispatchEx_iface, &dp, NULL); + return !--This->ref; } static void clean_props(vbdisp_t *This) @@ -196,9 +196,7 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) - run_terminator(This); - if(!ref) { + if(!ref && run_terminator(This)) { clean_props(This); list_remove(&This->entry); heap_free(This); @@ -431,8 +429,10 @@ void collect_objects(script_ctx_t *ctx) run_terminator(iter); LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &ctx->objects, vbdisp_t, entry) { + IDispatchEx_AddRef(&iter->IDispatchEx_iface); clean_props(iter); iter->desc = NULL; + IDispatchEx_Release(&iter->IDispatchEx_iface); } }

1 0

Jacek Caban : vbscript: Added support for SCRIPTITEM_ISVISIBLE named items.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 95d040e99e276d546a01f5cef49a4fd340dcdd0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d040e99e276d546a01f5cef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:09:45 2011 +0200 vbscript: Added support for SCRIPTITEM_ISVISIBLE named items. --- dlls/vbscript/interp.c | 23 +++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 2 ++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 306c2a2..0593a86 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -149,6 +149,29 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } } + + if((item->flags & SCRIPTITEM_ISVISIBLE) && !strcmpiW(item->name, name)) { + if(!item->disp) { + IUnknown *unk; + + hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + continue; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + continue; + } + } + + ref->type = REF_OBJ; + ref->u.obj = item->disp; + return S_OK; + } } if(!strcmpiW(name, errW)) { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 64230dc..2b33a2d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -620,4 +620,6 @@ 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") +Call ok(getVT(test) = "VT_DISPATCH", "getVT(test) = " & getVT(test)) + reportSuccess()

1 0

Jacek Caban : vbscript: Added On Error statement parser implementation.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 6afc32c97d080fa3b8933cdc0cae3338da5d7d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afc32c97d080fa3b8933cdc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:10:19 2011 +0200 vbscript: Added On Error statement parser implementation. --- dlls/vbscript/compile.c | 8 ++++++++ dlls/vbscript/interp.c | 7 +++++++ dlls/vbscript/parse.h | 6 ++++++ dlls/vbscript/parser.y | 15 +++++++++++++++ dlls/vbscript/vbscript.h | 1 + 5 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index b2c0cc1..6ee86e1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -697,6 +697,11 @@ static HRESULT compile_exitprop_statement(compile_ctx_t *ctx) return push_instr_addr(ctx, OP_jmp, ctx->prop_end_label); } +static HRESULT compile_onerror_statement(compile_ctx_t *ctx, onerror_statement_t *stat) +{ + return push_instr_int(ctx, OP_errmode, stat->resume_next); +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -734,6 +739,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_IF: hres = compile_if_statement(ctx, (if_statement_t*)stat); break; + case STAT_ONERROR: + hres = compile_onerror_statement(ctx, (onerror_statement_t*)stat); + break; case STAT_SET: hres = compile_assign_statement(ctx, (assign_statement_t*)stat, TRUE); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 16feabe..074dae1 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -732,6 +732,13 @@ static HRESULT interp_bool(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_errmode(exec_ctx_t *ctx) +{ + const int err_mode = ctx->instr->arg1.uint; + FIXME("%d\n", err_mode); + return E_NOTIMPL; +} + static HRESULT interp_string(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index bff48bb..976de53 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -107,6 +107,7 @@ typedef enum { STAT_EXITSUB, STAT_FUNC, STAT_IF, + STAT_ONERROR, STAT_SET, STAT_STOP, STAT_UNTIL, @@ -195,6 +196,11 @@ typedef struct { } while_statement_t; typedef struct { + statement_t stat; + BOOL resume_next; +} onerror_statement_t; + +typedef struct { const WCHAR *code; const WCHAR *ptr; const WCHAR *end; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a3fb134..d3ed732 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -55,6 +55,7 @@ static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); static statement_t *new_while_statement(parser_ctx_t*,statement_type_t,expression_t*,statement_t*); static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); +static statement_t *new_onerror_statement(parser_ctx_t*,BOOL); static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); @@ -170,6 +171,8 @@ Statement | tSET MemberExpression Arguments_opt '=' Expression { $2->args = $3; $$ = new_set_statement(ctx, $2, $5); CHECK_ERROR; } | tSTOP { $$ = new_statement(ctx, STAT_STOP, 0); CHECK_ERROR; } + | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, TRUE); CHECK_ERROR; } + | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, FALSE); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -614,6 +617,18 @@ static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, stat return &stat->stat; } +static statement_t *new_onerror_statement(parser_ctx_t *ctx, BOOL resume_next) +{ + onerror_statement_t *stat; + + stat = new_statement(ctx, STAT_ONERROR, sizeof(*stat)); + if(!stat) + return NULL; + + stat->resume_next = resume_next; + return &stat->stat; +} + static arg_decl_t *new_argument_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL by_ref) { arg_decl_t *arg_decl; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a1e07b9..e1c7fa1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -186,6 +186,7 @@ typedef enum { X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ + X(errmode, 1, ARG_INT, 0) \ X(eqv, 1, 0, 0) \ X(exp, 1, 0, 0) \ X(gt, 1, 0, 0) \

1 0

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

Sept. 19, 2011

Module: wine Branch: master Commit: 8bcd9876d30970a5ee8457c5275d36f6ada319e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bcd9876d30970a5ee8457c52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:08:48 2011 +0200 vbscript: Added isObject implementation. --- dlls/vbscript/global.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 87aef8f..0e71acf 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -25,8 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static HRESULT Global_IsObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + if(V_VT(arg) == (VT_VARIANT|VT_BYREF)) + arg = V_VARIANTREF(arg); + + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = V_VT(arg) == VT_DISPATCH ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static const builtin_prop_t global_props[] = {

1 0

Francois Gouget : shell32: Use wine_dbgstr_rect() to trace a potentially NULL rect struct.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 6454ec7f5dd016ba7cc9752337886d2aca31670c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6454ec7f5dd016ba7cc975233… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 22:52:58 2011 +0200 shell32: Use wine_dbgstr_rect() to trace a potentially NULL rect struct. --- dlls/shell32/shlview.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 3f18256..ff5f05c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2095,9 +2095,7 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2 *iface, TRACE("-- psvPrev %p, pfs %p, psbOwner %p, prcView %p\n", view_params->psvPrev, view_params->pfs, view_params->psbOwner, view_params->prcView); - TRACE("-- vmode %#x, flags %#x, left %d, top %d, right %d, bottom %d\n", - view_params->pfs->ViewMode, view_params->pfs->fFlags, view_params->prcView->left, - view_params->prcView->top, view_params->prcView->right, view_params->prcView->bottom); + TRACE("-- vmode %#x, flags %#x, view %s\n", view_params->pfs->ViewMode, view_params->pfs->fFlags, wine_dbgstr_rect(view_params->prcView)); if (!view_params->psbOwner) return E_UNEXPECTED;

1 0

Francois Gouget : po: Remove English strings from the Danish translation.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 718837171242e189e701c6960555904c22436ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=718837171242e189e701c6960… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 21:56:31 2011 +0200 po: Remove English strings from the Danish translation. --- po/da.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 94fee7f..470e65f 100644 --- a/po/da.po +++ b/po/da.po @@ -5076,15 +5076,15 @@ msgstr "Adresse fejl\n" #: winerror.mc:3261 msgid "Floating-point divide-by-zero\n" -msgstr "Floating-point divide-by-zero\n" +msgstr "" #: winerror.mc:3266 msgid "Floating-point underflow\n" -msgstr "Floating-point underflow\n" +msgstr "" #: winerror.mc:3271 msgid "Floating-point overflow\n" -msgstr "Floating-point overflow\n" +msgstr "" #: winerror.mc:3276 msgid "No more entries\n" @@ -9891,6 +9891,7 @@ msgstr "" "under visse betingelser; kør 'start /L' for yderligere oplysninger.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n"

1 0