wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Bruno Jesus : winecfg: Write the ProductName registry key based on selected OS.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 9f24f14cc03ee5d7ce65579ce1ab10583d9321ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f24f14cc03ee5d7ce65579ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 8 21:20:52 2011 -0300 winecfg: Write the ProductName registry key based on selected OS. --- programs/winecfg/appdefaults.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f90607e..d2c9e7d 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -424,10 +424,13 @@ static void on_winver_change(HWND dialog) win_versions[selection].dwMinorVersion, win_versions[selection].dwBuildNumber); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", win_versions[selection].szCSDVersion); + snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription); + set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "ProductName", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyWindNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyEnvNT, "OS", NULL); @@ -441,6 +444,8 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", win_versions[selection].szCSDVersion); snprintf(Buffer, sizeof(Buffer), "%d", win_versions[selection].dwBuildNumber); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", Buffer); + snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", win_versions[selection].szProductType); set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyWindNT, "CSDVersion", MAKEWORD( win_versions[selection].wServicePackMinor, @@ -449,6 +454,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "ProductName", NULL); set_reg_key(config_key, keypath(""), "Version", NULL); break; @@ -456,11 +462,13 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyWindNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyEnvNT, "OS", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "SubVersionNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKey9x, "ProductName", NULL); set_reg_key(config_key, keypath(""), "Version", win_versions[selection].szVersion); break; }

1 0

Jacek Caban : vbscript: Added null literal support.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 4520815c0229733eb578bdd048ff698a0e393687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4520815c0229733eb578bdd04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:36 2011 +0200 vbscript: Added null literal support. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 20 ++++++++++++++++++-- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/vbscript.h | 1 + 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index aa9881c..181f6c1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -204,6 +204,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) 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_NULL: + return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; 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 4e16d74..d02516e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -261,6 +261,16 @@ static HRESULT interp_empty(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_null(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_NULL; + return stack_push(ctx, &v); +} + static HRESULT interp_not(exec_ctx_t *ctx) { variant_val_t val; @@ -291,8 +301,14 @@ static HRESULT cmp_oper(exec_ctx_t *ctx) return hres; hres = stack_pop_val(ctx, &l); - if(SUCCEEDED(hres)) - hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); + if(SUCCEEDED(hres)) { + if(V_VT(l.v) == VT_NULL || V_VT(r.v) == VT_NULL) { + FIXME("comparing nulls is not implemented\n"); + hres = E_NOTIMPL; + }else { + hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); + } + } release_val(&r); release_val(&l); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 409e737..56b3e1b 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -22,6 +22,7 @@ typedef enum { EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, + EXPR_NULL, EXPR_STRING } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 36ebf17..c1c7e61 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -147,6 +147,7 @@ LiteralExpression | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } + | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } PrimaryExpression : '(' Expression ')' { $$ = $2; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3614f96..8a5a9c5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -37,5 +37,6 @@ 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") Call ok(getVT(Empty) = "VT_EMPTY", "getVT(Empty) is not VT_EMPTY") +Call ok(getVT(null) = "VT_NULL", "getVT(null) is not VT_NULL") reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index aa90f4c..199ca70 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -81,6 +81,7 @@ typedef enum { X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(not, 1, 0, 0) \ + X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(string, 1, ARG_STR, 0)

1 0

Jacek Caban : vbscript: Added empty literal support.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 6d8f84e5333bbb822127e636e1b4554f88629679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8f84e5333bbb822127e636e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:26 2011 +0200 vbscript: Added empty literal support. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 10 ++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/tests/lang.vbs | 3 +++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e9b651d..aa9881c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -196,6 +196,8 @@ 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_EMPTY: + return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_MEMBER: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index ec56fa9..4e16d74 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -251,6 +251,16 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_empty(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_EMPTY; + return stack_push(ctx, &v); +} + static HRESULT interp_not(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 607bdec..409e737 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_BOOL, + EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7bfdae9..36ebf17 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -35,6 +35,7 @@ static int parser_error(const char*); static void source_add_statement(parser_ctx_t*,statement_t*); +static void *new_expression(parser_ctx_t*,expression_type_t,size_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*); @@ -145,6 +146,7 @@ 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; } + | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } PrimaryExpression : '(' Expression ')' { $$ = $2; } @@ -172,7 +174,7 @@ static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) ctx->option_explicit = option_explicit; } -static void *new_expression(parser_ctx_t *ctx, expression_type_t type, unsigned size) +static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size) { expression_t *expr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1c9512a..3614f96 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -29,10 +29,13 @@ Call ok(true = true, "true = true is false") 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(empty = empty, "empty = empty is false") +Call ok(empty = "", "empty = """" 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") +Call ok(getVT(Empty) = "VT_EMPTY", "getVT(Empty) is not VT_EMPTY") reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0219334..aa90f4c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -76,6 +76,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \

1 0

Jacek Caban : vbscript: Added more tests.
by Alexandre Julliard 09 Sep '11

09 Sep '11

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

09 Sep '11

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 compiler/parser support for call expressions.
by Alexandre Julliard 09 Sep '11

09 Sep '11

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

09 Sep '11

Module: wine Branch: master Commit: 6d7ec9cf71ce2b3e9bb0745bb39f3592f15af43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7ec9cf71ce2b3e9bb0745bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:48:35 2011 +0200 vbscript: Added interp_equal implementation. --- dlls/vbscript/interp.c | 32 ++++++++++++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 29fed74..42bef36 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -253,10 +253,38 @@ static HRESULT interp_not(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT cmp_oper(exec_ctx_t *ctx) +{ + variant_val_t l, r; + HRESULT hres; + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) + hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); + + release_val(&r); + release_val(&l); + return hres; +} + static HRESULT interp_equal(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_EQ ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8f13c9c..6f8b815 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -25,4 +25,9 @@ call ok((true), "true is not true?") ok not false, "not false but not true?" ok not not true, "not not true but not true?" +Call ok(true = true, "true = true is false") +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") + reportSuccess()

1 0

Jacek Caban : vbscript: Added compiler support for equality expression.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: eb88228b62d7f1e8f8596a21c0cf89ed8409c58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb88228b62d7f1e8f8596a21c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:48:25 2011 +0200 vbscript: Added compiler support for equality expression. --- dlls/vbscript/compile.c | 17 +++++++++++++++++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c64c30c..5ed19c4 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -176,11 +176,28 @@ static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t * return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; } +static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t *expr, vbsop_t op) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->left); + if(FAILED(hres)) + return hres; + + hres = compile_expression(ctx, expr->right); + 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_EQUAL: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_STRING: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 0c3470b..29fed74 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -253,6 +253,12 @@ static HRESULT interp_not(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_equal(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 3f55b40..e717872 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -76,6 +76,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(equal, 1, 0, 0) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(not, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0

Jacek Caban : vbscript: Added parser support for equality expression.
by Alexandre Julliard 09 Sep '11

09 Sep '11

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

09 Sep '11

Module: wine Branch: master Commit: 6ca3cb623e1022b52af15a5747c80162426b19b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca3cb623e1022b52af15a574… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:55 2011 +0200 vbscript: Added interp_not implementation. --- dlls/vbscript/interp.c | 53 ++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/lang.vbs | 3 ++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f582e80..0c3470b 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -53,6 +53,12 @@ typedef struct { } u; } ref_t; +typedef struct { + VARIANT *v; + VARIANT store; + BOOL owned; +} variant_val_t; + static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) { named_item_t *item; @@ -109,6 +115,35 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } +static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *v) +{ + VARIANT *var; + + var = stack_pop(ctx); + + if(V_VT(var) == (VT_BYREF|VT_VARIANT)) { + v->owned = FALSE; + var = V_VARIANTREF(var); + }else { + v->owned = TRUE; + } + + if(V_VT(var) == VT_DISPATCH) { + FIXME("got dispatch - get its default value\n"); + return E_NOTIMPL; + }else { + v->v = var; + } + + return S_OK; +} + +static inline void release_val(variant_val_t *v) +{ + if(v->owned) + VariantClear(v->v); +} + static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { dp->cArgs = arg_cnt; @@ -200,8 +235,22 @@ static HRESULT interp_string(exec_ctx_t *ctx) static HRESULT interp_not(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; + + hres = VarNot(val.v, &v); + release_val(&val); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 32fc903..8f13c9c 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -22,4 +22,7 @@ call ok(true, "true is not true?") ok true, "true is not true?" call ok((true), "true is not true?") +ok not false, "not false but not true?" +ok not not true, "not not true but not true?" + reportSuccess()

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