September 2011 - Wine-Commits

Jacek Caban : vbscript: Added for..to statement parser implementation.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: d935c21ccf6bf48cab6ddafd3372106357bcc5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d935c21ccf6bf48cab6ddafd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:22:40 2011 +0200 vbscript: Added for..to statement parser implementation. --- dlls/vbscript/lex.c | 6 ++++++ dlls/vbscript/parse.h | 10 ++++++++++ dlls/vbscript/parser.y | 28 ++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f42d2fd..ac3d65e 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -44,6 +44,7 @@ static const WCHAR errorW[] = {'e','r','r','o','r',0}; static const WCHAR exitW[] = {'e','x','i','t',0}; static const WCHAR explicitW[] = {'e','x','p','l','i','c','i','t',0}; static const WCHAR falseW[] = {'f','a','l','s','e',0}; +static const WCHAR forW[] = {'f','o','r',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; static const WCHAR getW[] = {'g','e','t',0}; static const WCHAR gotoW[] = {'g','o','t','o',0}; @@ -68,9 +69,11 @@ static const WCHAR publicW[] = {'p','u','b','l','i','c',0}; static const WCHAR remW[] = {'r','e','m',0}; static const WCHAR resumeW[] = {'r','e','s','u','m','e',0}; static const WCHAR setW[] = {'s','e','t',0}; +static const WCHAR stepW[] = {'s','t','e','p',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; static const WCHAR subW[] = {'s','u','b',0}; static const WCHAR thenW[] = {'t','h','e','n',0}; +static const WCHAR toW[] = {'t','o',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; static const WCHAR untilW[] = {'u','n','t','i','l',0}; static const WCHAR wendW[] = {'w','e','n','d',0}; @@ -99,6 +102,7 @@ static const struct { {exitW, tEXIT}, {explicitW, tEXPLICIT}, {falseW, tFALSE}, + {forW, tFOR}, {functionW, tFUNCTION}, {getW, tGET}, {gotoW, tGOTO}, @@ -123,9 +127,11 @@ static const struct { {remW, tREM}, {resumeW, tRESUME}, {setW, tSET}, + {stepW, tSTEP}, {stopW, tSTOP}, {subW, tSUB}, {thenW, tTHEN}, + {toW, tTO}, {trueW, tTRUE}, {untilW, tUNTIL}, {wendW, tWEND}, diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 8e4be57..a5bd505 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -106,6 +106,7 @@ typedef enum { STAT_EXITFUNC, STAT_EXITPROP, STAT_EXITSUB, + STAT_FORTO, STAT_FUNC, STAT_IF, STAT_ONERROR, @@ -198,6 +199,15 @@ typedef struct { typedef struct { statement_t stat; + const WCHAR *identifier; + expression_t *from_expr; + expression_t *to_expr; + expression_t *step_expr; + statement_t *body; +} forto_statement_t; + +typedef struct { + statement_t stat; BOOL resume_next; } onerror_statement_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8435e92..3b30051 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -52,6 +52,7 @@ static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expr static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,expression_t*); 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_forto_statement(parser_ctx_t*,const WCHAR*,expression_t*,expression_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); @@ -102,7 +103,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token tIS tLTEQ tGTEQ tMOD %token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL +%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP %token tBYREF tBYVAL %token tOPTION tEXPLICIT %token tSTOP @@ -118,7 +119,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <member> MemberExpression -%type <expression> Arguments_opt ArgumentList_opt ArgumentList +%type <expression> Arguments_opt ArgumentList_opt ArgumentList Step_opt %type <bool> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl @@ -186,6 +187,8 @@ SimpleStatement | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, $2); CHECK_ERROR; } + | tFOR tIdentifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT + { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -206,6 +209,10 @@ DoType : tWHILE { $$ = TRUE; } | tUNTIL { $$ = FALSE; } +Step_opt + : /* empty */ { $$ = NULL;} + | tSTEP Expression { $$ = $2; } + IfStatement : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } @@ -626,6 +633,23 @@ static statement_t *new_while_statement(parser_ctx_t *ctx, statement_type_t type return &stat->stat; } +static statement_t *new_forto_statement(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *from_expr, + expression_t *to_expr, expression_t *step_expr, statement_t *body) +{ + forto_statement_t *stat; + + stat = new_statement(ctx, STAT_FORTO, sizeof(*stat)); + if(!stat) + return NULL; + + stat->identifier = identifier; + stat->from_expr = from_expr; + stat->to_expr = to_expr; + stat->step_expr = step_expr; + stat->body = body; + return &stat->stat; +} + static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, statement_t *if_stat, elseif_decl_t *elseif_decl, statement_t *else_stat) {

1 0

Jacek Caban : widl: Define __REQUIRED_RPCNDR_H_VERSION__ in generated headers.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: c7602d51b33e6fd74ef7cb87a5f50616f5a8a31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7602d51b33e6fd74ef7cb87a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 15:01:50 2011 +0200 widl: Define __REQUIRED_RPCNDR_H_VERSION__ in generated headers. --- tools/widl/header.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 579ef5c..fc9cbf1 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1358,6 +1358,11 @@ void write_header(const statement_list_t *stmts) return; } fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n\n", PACKAGE_VERSION, input_name); + + fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n"); + fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); + fprintf(header, "#endif\n\n"); + fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n\n" );

1 0

Huw Davies : gdi32/tests: Add some tests to show the 1 pixel dst sizes are a special case.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 4156460d49cd87f93322630ec2ca34f8bb143a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4156460d49cd87f93322630ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 22 13:56:29 2011 +0100 gdi32/tests: Add some tests to show the 1 pixel dst sizes are a special case. --- dlls/gdi32/tests/bitmap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 16dfcb2..89d2c9c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2826,6 +2826,7 @@ static void test_StretchBlt(void) check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + /* This is an example of the dst width (height) == 1 exception, explored below */ expected[0] = 0xCAFED00D, expected[1] = 0x00000000; expected[16] = 0x00000000, expected[17] = 0x00000000; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, @@ -2853,10 +2854,63 @@ static void test_StretchBlt(void) check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + /* when dst width is 1 merge src width - 1 pixels */ + memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); + srcBuffer[0] = 0x0000ff00, srcBuffer[1] = 0x0000f0f0, srcBuffer[2] = 0x0000cccc, srcBuffer[3] = 0x0000aaaa; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = srcBuffer[0]; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 1, expected, __LINE__); + + expected[0] = srcBuffer[0] & srcBuffer[1]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 3, 1, expected, __LINE__); + + expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 4, 1, expected, __LINE__); + + /* this doesn't happen if the src width is -ve */ + expected[0] = srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 2, 0, -2, 1, expected, __LINE__); + + /* when dst width > 1 behaviour reverts to what one would expect */ + expected[0] = srcBuffer[0] & srcBuffer[1], expected[1] = srcBuffer[2] & srcBuffer[3]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 1, 0, 0, 4, 1, expected, __LINE__); + + /* similarly in the vertical direction */ + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = srcBuffer[0]; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 2, expected, __LINE__); + + /* check that it's the dst size in device units that needs to be 1 */ + SetMapMode( hdcDst, MM_ISOTROPIC ); + SetWindowExtEx( hdcDst, 200, 200, NULL ); + SetViewportExtEx( hdcDst, 100, 100, NULL ); + + expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 4, 1, expected, __LINE__); + SetMapMode( hdcDst, MM_TEXT ); + SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); /* Top-down to bottom-up tests */ + memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); + srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + biDst.bmiHeader.biHeight = 16; bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0);

1 0

Huw Davies : gdi32/tests: Update the StretchBlt tests to use a 16x16 bitmap .
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: abc76c27a72d5fc8d06046a7d73ce3bddfd3e843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc76c27a72d5fc8d06046a7d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 22 13:56:28 2011 +0100 gdi32/tests: Update the StretchBlt tests to use a 16x16 bitmap. --- dlls/gdi32/tests/bitmap.c | 161 +++++++++++++++++++++----------------------- 1 files changed, 77 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abc76c27a72d5fc8d0604…

1 0

Jacek Caban : vbscript: Added support for DISPATCH_METHOD flags in invoke_builtin.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: f61bd1c5bf748b0a2d940b98105c48ff660eefbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61bd1c5bf748b0a2d940b981… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:25:06 2011 +0200 vbscript: Added support for DISPATCH_METHOD flags in invoke_builtin. --- dlls/vbscript/vbdisp.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 96df71a..d083d74 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -139,14 +139,15 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f FIXME("property does not support DISPATCH_PROPERTYGET\n"); return E_FAIL; } - /* FALLTHROUGH */ + break; case DISPATCH_PROPERTYGET|DISPATCH_METHOD: - if(arg_cnt(dp) < prop->min_args || arg_cnt(dp) > (prop->max_args ? prop->max_args : prop->min_args)) { - FIXME("invalid number of arguments\n"); + break; + case DISPATCH_METHOD: + if(prop->flags & (BP_GET|BP_GETPUT)) { + FIXME("Call on property\n"); return E_FAIL; } - - return prop->proc(This, dp->rgvarg, dp->cArgs, res); + break; case DISPATCH_PROPERTYPUT: if(!(prop->flags & (BP_GET|BP_GETPUT))) { FIXME("property does not support DISPATCH_PROPERTYPUT\n"); @@ -159,6 +160,13 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f FIXME("unsupported flags %x\n", flags); return E_NOTIMPL; } + + if(arg_cnt(dp) < prop->min_args || arg_cnt(dp) > (prop->max_args ? prop->max_args : prop->min_args)) { + FIXME("invalid number of arguments\n"); + return E_FAIL; + } + + return prop->proc(This, dp->rgvarg, dp->cArgs, res); } static BOOL run_terminator(vbdisp_t *This)

1 0

Jacek Caban : vbscript: Added interp_val implementation.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: aad758921c2efc6442fc6dfc3836b3a27658527e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad758921c2efc6442fc6dfc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:23:25 2011 +0200 vbscript: Added interp_val implementation. --- dlls/vbscript/interp.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1327c17..5e41845 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -684,8 +684,24 @@ static HRESULT interp_const(exec_ctx_t *ctx) static HRESULT interp_val(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t val; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + if(!val.owned) { + V_VT(&v) = VT_EMPTY; + hres = VariantCopy(&v, val.v); + if(FAILED(hres)) + return hres; + } + + return stack_push(ctx, val.owned ? val.v : &v); } static HRESULT interp_pop(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Better stub for interp_errmode.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: 00de502b365e48f763cbef522262556e698abf51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00de502b365e48f763cbef522… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:26:25 2011 +0200 vbscript: Better stub for interp_errmode. --- dlls/vbscript/interp.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 678b51a..08bf710 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -37,6 +37,8 @@ typedef struct { dynamic_var_t *dynamic_vars; vbsheap_t heap; + BOOL resume_next; + unsigned stack_size; unsigned top; VARIANT *stack; @@ -891,8 +893,11 @@ static HRESULT interp_bool(exec_ctx_t *ctx) static HRESULT interp_errmode(exec_ctx_t *ctx) { const int err_mode = ctx->instr->arg1.uint; - FIXME("%d\n", err_mode); - return E_NOTIMPL; + + TRACE("%d\n", err_mode); + + ctx->resume_next = err_mode; + return S_OK; } static HRESULT interp_string(exec_ctx_t *ctx) @@ -1659,7 +1664,10 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DI op = exec.instr->op; hres = op_funcs[op](&exec); if(FAILED(hres)) { - FIXME("Failed %08x\n", hres); + if(exec.resume_next) + FIXME("Failed %08x in resume next mode\n", hres); + else + WARN("Failed %08x\n", hres); stack_popn(&exec, exec.top); break; }

1 0

Jacek Caban : vbscript: Added for..in statement tests.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: cbb735e2ce46d865c02524d7024a1f0921f1811b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb735e2ce46d865c02524d70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:24:20 2011 +0200 vbscript: Added for..in statement tests. --- dlls/vbscript/tests/lang.vbs | 56 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2d712f5..3b3ad50 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -18,7 +18,7 @@ Option Explicit -dim x, y +dim x, y, z call ok(true, "true is not true?") ok true, "true is not true?" @@ -333,6 +333,60 @@ do ok false, "exit do didn't work" loop while true +y = "for1:" +for x = 5 to 8 + y = y & " " & x +next +Call ok(y = "for1: 5 6 7 8", "y = " & y) + +y = "for2:" +for x = 5 to 8 step 2 + y = y & " " & x +next +Call ok(y = "for2: 5 7", "y = " & y) + +y = "for3:" +x = 2 +for x = x+3 to 8 + y = y & " " & x +next +Call ok(y = "for3: 5 6 7 8", "y = " & y) + +y = "for4:" +for x = 5 to 4 + y = y & " " & x +next +Call ok(y = "for4:", "y = " & y) + +y = "for5:" +for x = 5 to 3 step true + y = y & " " & x +next +Call ok(y = "for5: 5 4 3", "y = " & y) + +y = "for6:" +z = 4 +for x = 5 to z step 3-4 + y = y & " " & x + z = 0 +next +Call ok(y = "for6: 5 4", "y = " & y) + +y = "for7:" +z = 1 +for x = 5 to 8 step z + y = y & " " & x + z = 2 +next +Call ok(y = "for7: 5 6 7 8", "y = " & y) + +y = "for8:" +for x = 5 to 8 + y = y & " " & x + x = x+1 +next +Call ok(y = "for8: 5 7", "y = " & y) + if false then Sub testsub x = true

1 0

Jacek Caban : vbscript: Added interp_incc implementation.
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: a765b1ecc391f538227184caf6c8f45cc0a81125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a765b1ecc391f538227184caf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:24:05 2011 +0200 vbscript: Added interp_incc implementation. --- dlls/vbscript/interp.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index c95183d..08ea83e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1518,8 +1518,28 @@ static HRESULT interp_neg(exec_ctx_t *ctx) static HRESULT interp_incc(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg1.bstr; - FIXME("%s\n", debugstr_w(ident)); - return E_NOTIMPL; + VARIANT v; + ref_t ref; + HRESULT hres; + + TRACE("\n"); + + hres = lookup_identifier(ctx, ident, VBDISP_LET, &ref); + if(FAILED(hres)) + return hres; + + if(ref.type != REF_VAR) { + FIXME("ref.type is not REF_VAR\n"); + return E_FAIL; + } + + hres = VarAdd(stack_top(ctx, 0), ref.u.v, &v); + if(FAILED(hres)) + return hres; + + VariantClear(ref.u.v); + *ref.u.v = v; + return S_OK; } static const instr_func_t op_funcs[] = {

1 0

Jacek Caban : vbscript: Added CreateObject tests ( based on jscript ActiveXObject tests).
by Alexandre Julliard Sept. 22, 2011

Sept. 22, 2011

Module: wine Branch: master Commit: f48658c106e532027cce61b78e7908787f4f0803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48658c106e532027cce61b78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:26:13 2011 +0200 vbscript: Added CreateObject tests (based on jscript ActiveXObject tests). --- dlls/vbscript/tests/Makefile.in | 3 +- dlls/vbscript/tests/createobj.c | 1016 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1018 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f48658c106e532027cce6…

1 0