wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Jacek Caban : vbscript: Added isObject implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

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

Jacek Caban : vbscript: Added global object' s isObject function stub implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

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: Store reference to collected object in collect_objects.
by Alexandre Julliard 19 Sep '11

19 Sep '11

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 is expression implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

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: Added interp_lteq implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

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_lt implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

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 interp_gt implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

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_gteq implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

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 more equality expressions parser/ compiler implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: beef0956544ed66d3b12bbb1c6668581029a1351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beef0956544ed66d3b12bbb1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:07:12 2011 +0200 vbscript: Added more equality expressions parser/compiler implementation. --- dlls/vbscript/compile.c | 8 ++++++++ dlls/vbscript/interp.c | 24 ++++++++++++++++++++++++ dlls/vbscript/parse.h | 4 ++++ dlls/vbscript/parser.y | 4 ++++ dlls/vbscript/vbscript.h | 4 ++++ 5 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 60e4935..c939aea 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -381,10 +381,18 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eqv); case EXPR_EXP: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_exp); + case EXPR_GT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); + case EXPR_GTEQ: + 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_IMP: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_imp); + case EXPR_LT: + 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_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 c8e0514..9a49396 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -941,6 +941,30 @@ static HRESULT interp_nequal(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_gt(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_gteq(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_lt(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_lteq(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + 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 d121b72..ef7f139 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -27,8 +27,12 @@ typedef enum { EXPR_EQUAL, EXPR_EQV, EXPR_EXP, + EXPR_GT, + EXPR_GTEQ, EXPR_IDIV, EXPR_IMP, + EXPR_LT, + EXPR_LTEQ, EXPR_MEMBER, EXPR_MOD, EXPR_MUL, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b1b385b..d0c3f70 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -248,6 +248,10 @@ EqualityExpression : ConcatExpression { $$ = $1; } | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; } | EqualityExpression tNEQ ConcatExpression { $$ = new_binary_expression(ctx, EXPR_NEQUAL, $1, $3); CHECK_ERROR; } + | EqualityExpression '>' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_GT, $1, $3); CHECK_ERROR; } + | 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; } ConcatExpression : AdditiveExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 12315ae..c73f11d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -161,6 +161,8 @@ typedef enum { X(equal, 1, 0, 0) \ X(eqv, 1, 0, 0) \ X(exp, 1, 0, 0) \ + X(gt, 1, 0, 0) \ + X(gteq, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \ @@ -169,6 +171,8 @@ typedef enum { X(jmp_false, 0, ARG_ADDR, 0) \ X(jmp_true, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ + X(lt, 1, 0, 0) \ + X(lteq, 1, 0, 0) \ X(mcall, 1, ARG_BSTR, ARG_UINT) \ X(mcallv, 1, ARG_BSTR, ARG_UINT) \ X(mod, 1, 0, 0) \

1 0

Bernhard Loos : rpcrt4: Switch to non-overlapped named pipe operations and use a thread for the async listen operation .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: c2feafb96cddc6e55b07964dcd7f7b8dcb33d666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2feafb96cddc6e55b07964dc… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Sep 19 13:01:36 2011 +0200 rpcrt4: Switch to non-overlapped named pipe operations and use a thread for the async listen operation. --- dlls/rpcrt4/rpc_transport.c | 80 ++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c2dac67..4632f4a 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -111,8 +111,7 @@ typedef struct _RpcConnection_np { RpcConnection common; HANDLE pipe; - OVERLAPPED read_ovl; - OVERLAPPED write_ovl; + HANDLE listen_thread; BOOL listening; } RpcConnection_np; @@ -122,25 +121,21 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) return &npc->common; } -static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) +static DWORD CALLBACK listen_thread(void *arg) { - if (npc->listening) - return RPC_S_OK; - - npc->listening = TRUE; + RpcConnection_np *npc = arg; for (;;) { - if (ConnectNamedPipe(npc->pipe, &npc->read_ovl)) + if (ConnectNamedPipe(npc->pipe, NULL)) return RPC_S_OK; switch(GetLastError()) { case ERROR_PIPE_CONNECTED: - SetEvent(npc->read_ovl.hEvent); - return RPC_S_OK; - case ERROR_IO_PENDING: - /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ return RPC_S_OK; + case ERROR_HANDLES_CLOSED: + /* connection closed during listen */ + return RPC_S_NO_CONTEXT_AVAILABLE; case ERROR_NO_DATA_DETECTED: /* client has disconnected, retry */ DisconnectNamedPipe( npc->pipe ); @@ -153,12 +148,28 @@ static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) } } +static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) +{ + if (npc->listening) + return RPC_S_OK; + + npc->listening = TRUE; + npc->listen_thread = CreateThread(NULL, 0, listen_thread, npc, 0, NULL); + if (!npc->listen_thread) + { + npc->listening = FALSE; + ERR("Couldn't create listen thread (error was %d)\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } + return RPC_S_OK; +} + static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; TRACE("listening on %s\n", pname); - npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); @@ -170,9 +181,6 @@ static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pnam return RPC_S_CANT_CREATE_ENDPOINT; } - npc->read_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - npc->write_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - /* Note: we don't call ConnectNamedPipe here because it must be done in the * server thread as the thread must be alertable */ return RPC_S_OK; @@ -231,8 +239,6 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); - npc->read_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - npc->write_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); npc->pipe = pipe; return RPC_S_OK; @@ -360,11 +366,9 @@ static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np * * to the child, then reopen the server binding to continue listening */ new_npc->pipe = old_npc->pipe; - new_npc->read_ovl = old_npc->read_ovl; - new_npc->write_ovl = old_npc->write_ovl; + new_npc->listen_thread = old_npc->listen_thread; old_npc->pipe = 0; - memset(&old_npc->read_ovl, 0, sizeof(old_npc->read_ovl)); - memset(&old_npc->write_ovl, 0, sizeof(old_npc->write_ovl)); + old_npc->listen_thread = 0; old_npc->listening = FALSE; } @@ -413,9 +417,7 @@ static int rpcrt4_conn_np_read(RpcConnection *Connection, while (bytes_left) { DWORD bytes_read; - ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->read_ovl); - if (!ret && GetLastError() == ERROR_IO_PENDING) - ret = GetOverlappedResult(npc->pipe, &npc->read_ovl, &bytes_read, TRUE); + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); if (!ret && GetLastError() == ERROR_MORE_DATA) ret = TRUE; if (!ret || !bytes_read) @@ -437,9 +439,7 @@ static int rpcrt4_conn_np_write(RpcConnection *Connection, while (bytes_left) { DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &npc->write_ovl); - if (!ret && GetLastError() == ERROR_IO_PENDING) - ret = GetOverlappedResult(npc->pipe, &npc->write_ovl, &bytes_written, TRUE); + ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); if (!ret || !bytes_written) break; bytes_left -= bytes_written; @@ -456,13 +456,9 @@ static int rpcrt4_conn_np_close(RpcConnection *Connection) CloseHandle(npc->pipe); npc->pipe = 0; } - if (npc->read_ovl.hEvent) { - CloseHandle(npc->read_ovl.hEvent); - npc->read_ovl.hEvent = 0; - } - if (npc->write_ovl.hEvent) { - CloseHandle(npc->write_ovl.hEvent); - npc->write_ovl.hEvent = 0; + if (npc->listen_thread) { + CloseHandle(npc->listen_thread); + npc->listen_thread = 0; } return 0; } @@ -666,7 +662,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { rpcrt4_conn_listen_pipe(conn); - if (conn->read_ovl.hEvent) + if (conn->listen_thread) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -687,7 +683,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if ((objs[*count] = conn->read_ovl.hEvent)) + if ((objs[*count] = conn->listen_thread)) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -734,12 +730,18 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, EnterCriticalSection(&protseq->cs); conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if (b_handle == conn->read_ovl.hEvent) break; + if (b_handle == conn->listen_thread) break; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } cconn = NULL; if (conn) - RPCRT4_SpawnConnection(&cconn, &conn->common); + { + DWORD exit_code; + if (GetExitCodeThread(conn->listen_thread, &exit_code) && exit_code == RPC_S_OK) + RPCRT4_SpawnConnection(&cconn, &conn->common); + CloseHandle(conn->listen_thread); + conn->listen_thread = 0; + } else ERR("failed to locate connection for handle %p\n", b_handle); LeaveCriticalSection(&protseq->cs);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011