September 2011 - Wine-Commits

André Hentschel : ntdll: Remove dead increments (clang ).
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: c20813f15f8e92443a8f15b97c061e7bb9cafd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20813f15f8e92443a8f15b97… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 9 17:19:29 2011 +0200 ntdll: Remove dead increments (clang). --- dlls/ntdll/actctx.c | 1 - dlls/ntdll/path.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 75c1cbf..380ce8f 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2617,7 +2617,6 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle { afdi->lpAssemblyDirectoryName = ptr; memcpy(ptr, assembly->directory, ad_len * sizeof(WCHAR)); - ptr += ad_len; } else afdi->lpAssemblyDirectoryName = NULL; RtlFreeHeap( GetProcessHeap(), 0, assembly_id ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 6138fa8..23f2bbd 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -751,7 +751,6 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) memmove(buffer + reqsize / sizeof(WCHAR), name + dep, deplen + sizeof(WCHAR)); if (reqsize) memcpy(buffer, ins_str, reqsize); - reqsize += deplen; if (ins_str != tmp && ins_str != cd->Buffer) RtlFreeHeap(GetProcessHeap(), 0, ins_str);

1 0

Francois Gouget : comctl32/tests: Use the PROPSHEETHEADERA_V1_SIZE macros for compatibility with old comctl32 versions .
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 5464d5423a89014cfaae41dda9f42706808f2b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5464d5423a89014cfaae41dda… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 6 00:21:04 2011 +0200 comctl32/tests: Use the PROPSHEETHEADERA_V1_SIZE macros for compatibility with old comctl32 versions. --- dlls/comctl32/tests/propsheet.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 6d47160..92fb1dd 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -121,7 +121,7 @@ static void test_title(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; psh.pszCaption = "test caption"; psh.nPages = 1; @@ -160,7 +160,7 @@ static void test_nopage(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; psh.pszCaption = "test caption"; psh.nPages = 1; @@ -237,7 +237,7 @@ static void test_disableowner(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = sizeof(psh); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_USECALLBACK; psh.pszCaption = "test caption"; psh.nPages = 1; @@ -317,7 +317,7 @@ static void test_wiznavigation(void) /* set up the property sheet dialog */ memset(&psh, 0, sizeof(psh)); - psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_MODELESS | PSH_WIZARD; psh.pszCaption = "A Wizard"; psh.nPages = 4; @@ -420,7 +420,7 @@ static void test_buttons(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; psh.pszCaption = "test caption"; psh.nPages = 1; @@ -499,7 +499,7 @@ static void test_custom_default_button(void) psp[0].pszTitle = "Page1"; psp[0].lParam = 0; - psh.dwSize = sizeof (PROPSHEETHEADERA); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_PROPSHEETPAGE | PSH_MODELESS; psh.hwndParent = GetDesktopWindow(); psh.hInstance = GetModuleHandleA(NULL); @@ -729,7 +729,7 @@ static void test_messages(void) hpsp[0] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_NOAPPLYNOW | PSH_WIZARD | PSH_USECALLBACK | PSH_MODELESS | PSH_USEICONID; psh.pszCaption = "test caption"; @@ -772,7 +772,7 @@ static void test_PSM_ADDPAGE(void) hpsp[2] = CreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); - psh.dwSize = sizeof(psh); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; psh.dwFlags = PSH_MODELESS; psh.pszCaption = "test caption"; psh.nPages = 1;

1 0

André Hentschel : crypt32/tests: Remove dead assignment (clang).
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: cb55d2a255b2da4d040211102a1c2845d3640d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb55d2a255b2da4d040211102… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 9 17:32:14 2011 +0200 crypt32/tests: Remove dead assignment (clang). --- dlls/crypt32/tests/base64.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index c5c436b..8f19515 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -117,11 +117,8 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, "Expected %s, got %s\n", expected, ptr); ptr += strlen(expected); if (trailer) - { ok(!strncmp(trailer, ptr, strlen(trailer)), "Expected trailer %s, got %s\n", trailer, ptr); - ptr += strlen(trailer); - } HeapFree(GetProcessHeap(), 0, str); } }

1 0

Jacek Caban : vbscript: Added compiler/parser support for call expressions.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 114ffc8720a5ece8700802b33be97f9ae839fd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114ffc8720a5ece8700802b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:48:48 2011 +0200 vbscript: Added compiler/parser support for call expressions. --- dlls/vbscript/compile.c | 8 +++++--- dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parser.y | 8 ++++++-- dlls/vbscript/vbscript.h | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 5ed19c4..e9b651d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -146,7 +146,7 @@ static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *re return S_OK; } -static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr) +static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr, BOOL ret_val) { unsigned arg_cnt = 0; HRESULT hres; @@ -159,7 +159,7 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t FIXME("obj_expr not implemented\n"); hres = E_NOTIMPL; }else { - hres = push_instr_bstr_uint(ctx, OP_icallv, expr->identifier, arg_cnt); + hres = push_instr_bstr_uint(ctx, ret_val ? OP_icall : OP_icallv, expr->identifier, arg_cnt); } return hres; @@ -198,6 +198,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); + case EXPR_MEMBER: + return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_STRING: @@ -217,7 +219,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) while(stat) { switch(stat->type) { case STAT_CALL: - hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr); + hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); break; default: FIXME("Unimplemented statement type %d\n", stat->type); diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 42bef36..d88439a 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -168,6 +168,12 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) } } +static HRESULT interp_icall(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_icallv(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7703402..7bfdae9 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -75,7 +75,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token <string> tIdentifier tString %type <statement> Statement StatementNl -%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression +%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression %type <expression> NotExpression %type <member> MemberExpression @@ -135,7 +135,11 @@ EqualityExpression ConcatExpression : LiteralExpression /* FIXME */ { $$ = $1; } - | PrimaryExpression /* FIXME */ { $$ = $1; } + | CallExpression /* FIXME */ { $$ = $1; } + +CallExpression + : PrimaryExpression { $$ = $1; } + | MemberExpression Arguments_opt { $1->args = $2; $$ = &$1->expr; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index e717872..0219334 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -77,6 +77,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ X(equal, 1, 0, 0) \ + X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(not, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_icall implementation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 62a21545726ab580128b664a6f257838dbafe5d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a21545726ab580128b664a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:00 2011 +0200 vbscript: Added interp_icall implementation. --- dlls/vbscript/interp.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d88439a..ec56fa9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -168,13 +168,7 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) } } -static HRESULT interp_icall(exec_ctx_t *ctx) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT interp_icallv(exec_ctx_t *ctx) +static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) { BSTR identifier = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; @@ -182,8 +176,6 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) DISPPARAMS dp; HRESULT hres; - TRACE("\n"); - hres = lookup_identifier(ctx, identifier, &ref); if(FAILED(hres)) return hres; @@ -192,7 +184,7 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) switch(ref.type) { case REF_DISP: - hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, NULL); + hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, res); if(FAILED(hres)) return hres; break; @@ -205,6 +197,26 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_icall(exec_ctx_t *ctx) +{ + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = do_icall(ctx, &v); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + +static HRESULT interp_icallv(exec_ctx_t *ctx) +{ + TRACE("\n"); + return do_icall(ctx, NULL); +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n");

1 0

Jacek Caban : vbscript: Added support for |f a, b, c| call statement.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: a921bd2ea4f988d615ece2f9d1a24ff6e3ab593d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a921bd2ea4f988d615ece2f9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:46:46 2011 +0200 vbscript: Added support for |f a, b, c| call statement. --- dlls/vbscript/lex.c | 22 +++++++++++++++++++--- dlls/vbscript/parser.y | 14 +++++++++----- dlls/vbscript/tests/lang.vbs | 1 + 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 2fd51bc..41f76e9 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -240,12 +240,17 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) return tString; } +static void skip_spaces(parser_ctx_t *ctx) +{ + while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') + ctx->ptr++; +} + static int parse_next_token(void *lval, parser_ctx_t *ctx) { WCHAR c; - while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') - ctx->ptr++; + skip_spaces(ctx); if(ctx->ptr == ctx->end) return ctx->last_token == tNL ? tEOF : tNL; @@ -269,7 +274,6 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) else ctx->ptr = ctx->end; return tNL; - case '(': case ')': case ',': case '=': @@ -281,6 +285,18 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '\\': case '.': return *ctx->ptr++; + case '(': + /* NOTE: + * We resolve empty brackets in lexer instead of parser to avoid complex conflicts + * in call statement special case |f()| without 'call' keyword + */ + ctx->ptr++; + skip_spaces(ctx); + if(*ctx->ptr == ')') { + ctx->ptr++; + return tEMPTYBRACKETS; + } + return '('; case '"': return parse_string_literal(ctx, lval); default: diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2d50565..72790fa 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -56,7 +56,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); member_expression_t *member; } -%token tEOF tNL tREM +%token tEOF tNL tREM tEMPTYBRACKETS %token tTRUE tFALSE %token tNOT tAND tOR tXOR tEQV tIMP tNEQ %token tIS tLTEQ tGTEQ tMOD @@ -89,7 +89,7 @@ StatementNl : Statement tNL { $$ = $1; } Statement - : MemberExpression Arguments_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } + : MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } MemberExpression @@ -97,17 +97,21 @@ MemberExpression /* FIXME: MemberExpressionArgs '.' tIdentifier */ Arguments_opt - : /* empty */ { $$ = NULL; } - | '(' ArgumentList_opt ')' { $$ = $2; } + : EmptyBrackets_opt { $$ = NULL; } + | '(' ArgumentList ')' { $$ = $2; } ArgumentList_opt - : /* empty */ { $$ = NULL; } + : EmptyBrackets_opt { $$ = NULL; } | ArgumentList { $$ = $1; } ArgumentList : Expression { $$ = $1; } | Expression ',' ArgumentList { $1->next = $3; $$ = $1; } +EmptyBrackets_opt + : /* empty */ + | tEMPTYBRACKETS + Expression : LiteralExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 642c2ff..55a8cad 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -17,5 +17,6 @@ ' call ok(true, "true is not true?") +ok true, "true is not true?" reportSuccess()

1 0

Jacek Caban : vbscript: Added more tests.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: ddc47d6974571d0681003523edd7bb72fd8bb187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc47d6974571d0681003523e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:14 2011 +0200 vbscript: Added more tests. --- dlls/vbscript/tests/lang.vbs | 5 ++++ dlls/vbscript/tests/run.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6f8b815..1c9512a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -30,4 +30,9 @@ Call ok(false = false, "false = false is false") Call ok(not (true = false), "true = false is true") Call ok("x" = "x", """x"" = ""x"" is false") +Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") +Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") +Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") +Call ok(getVT("test") = "VT_BSTR", "getVT(""test"") is not VT_BSTR") + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index b8cef40..329d75a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -62,6 +62,7 @@ DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_OK 1002 +#define DISPID_GLOBAL_GETVT 1003 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -87,6 +88,38 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(buf, stra); } +static const char *vt2a(VARIANT *v) +{ + if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { + static char buf[64]; + sprintf(buf, "%s*", vt2a(V_BYREF(v))); + return buf; + } + + switch(V_VT(v)) { + case VT_EMPTY: + return "VT_EMPTY"; + case VT_NULL: + return "VT_NULL"; + case VT_I2: + return "VT_I2"; + case VT_I4: + return "VT_I4"; + case VT_R8: + return "VT_R8"; + case VT_BSTR: + return "VT_BSTR"; + case VT_DISPATCH: + return "VT_DISPATCH"; + case VT_BOOL: + return "VT_BOOL"; + case VT_ARRAY|VT_VARIANT: + return "VT_ARRAY|VT_VARIANT"; + default: + ok(0, "unknown vt %d\n", V_VT(v)); + return NULL; + } +} #define test_grfdex(a,b) _test_grfdex(__LINE__,a,b) static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) @@ -202,6 +235,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_REPORTSUCCESS; return S_OK; } + if(!strcmp_wa(bstrName, "getVT")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_GETVT; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -254,6 +292,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, trace("%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); return S_OK; + case DISPID_GLOBAL_REPORTSUCCESS: CHECK_EXPECT(global_success_i); @@ -266,6 +305,20 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(pei != NULL, "pei == NULL\n"); return S_OK; + + case DISPID_GLOBAL_GETVT: + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_BSTR; + V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); + return S_OK; } ok(0, "unexpected call %d\n", id);

1 0

Jacek Caban : vbscript: Added parser support for equality expression.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 82b7651841088c3a44b60a182490fd2a3976229f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b7651841088c3a44b60a182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:48:13 2011 +0200 vbscript: Added parser support for equality expression. --- dlls/vbscript/parse.h | 7 +++++++ dlls/vbscript/parser.y | 26 ++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 0e1b4d1..607bdec 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_BOOL, + EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, EXPR_STRING @@ -45,6 +46,12 @@ typedef struct { typedef struct { expression_t expr; + expression_t *left; + expression_t *right; +} binary_expression_t; + +typedef struct { + expression_t expr; expression_t *obj_expr; const WCHAR *identifier; expression_t *args; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a743b97..7703402 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -38,6 +38,7 @@ static void source_add_statement(parser_ctx_t*,statement_t*); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); +static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); @@ -74,7 +75,8 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token <string> tIdentifier tString %type <statement> Statement StatementNl -%type <expression> Expression LiteralExpression PrimaryExpression +%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression +%type <expression> ConcatExpression %type <expression> NotExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -124,9 +126,16 @@ Expression : NotExpression { $$ = $1; } NotExpression + : EqualityExpression { $$ = $1; } + | tNOT NotExpression { $$ = new_unary_expression(ctx, EXPR_NOT, $2); CHECK_ERROR; } + +EqualityExpression + : ConcatExpression { $$ = $1; } + | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; } + +ConcatExpression : LiteralExpression /* FIXME */ { $$ = $1; } | PrimaryExpression /* FIXME */ { $$ = $1; } - | tNOT NotExpression { $$ = new_unary_expression(ctx, EXPR_NOT, $2); CHECK_ERROR; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } @@ -208,6 +217,19 @@ static expression_t *new_unary_expression(parser_ctx_t *ctx, expression_type_t t return &expr->expr; } +static expression_t *new_binary_expression(parser_ctx_t *ctx, expression_type_t type, expression_t *left, expression_t *right) +{ + binary_expression_t *expr; + + expr = new_expression(ctx, type, sizeof(*expr)); + if(!expr) + return NULL; + + expr->left = left; + expr->right = right; + return &expr->expr; +} + static member_expression_t *new_member_expression(parser_ctx_t *ctx, expression_t *obj_expr, const WCHAR *identifier) { member_expression_t *expr;

1 0

Jacek Caban : vbscript: Added compiler support for |not| expression.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 7f9464ce2759eb96ccc0bb7b782ce029689f692d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9464ce2759eb96ccc0bb7b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:45 2011 +0200 vbscript: Added compiler support for |not| expression. --- dlls/vbscript/compile.c | 13 +++++++++++++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index ea55177..c64c30c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -165,11 +165,24 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t return hres; } +static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t *expr, vbsop_t op) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->subexpr); + if(FAILED(hres)) + return hres; + + return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; +} + static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) { switch(expr->type) { case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + case EXPR_NOT: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); default: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a33ff90..f582e80 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -198,6 +198,12 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_not(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 54d7da5..3f55b40 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -77,6 +77,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(not, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(string, 1, ARG_STR, 0)

1 0

Jacek Caban : vbscript: Added support for parentheses in expressions.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: a17f9aa07ad94888a21cc14c83d47fa923d30974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17f9aa07ad94888a21cc14c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:21 2011 +0200 vbscript: Added support for parentheses in expressions. --- dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 258420d..728d69b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -73,7 +73,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token <string> tIdentifier tString %type <statement> Statement StatementNl -%type <expression> Expression LiteralExpression +%type <expression> Expression LiteralExpression PrimaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -120,12 +120,16 @@ EmptyBrackets_opt Expression : LiteralExpression /* FIXME */ { $$ = $1; } + | PrimaryExpression /* FIXME */ { $$ = $1; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } +PrimaryExpression + : '(' Expression ')' { $$ = $2; } + %% static int parser_error(const char *str) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 07585fa..32fc903 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -20,5 +20,6 @@ Option Explicit call ok(true, "true is not true?") ok true, "true is not true?" +call ok((true), "true is not true?") reportSuccess()

1 0