wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Ambrož Bizjak : ucrtbase: Implement t and j printf length modifiers.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 3b6b28bce5f2f05ba21d6ca5399517c22300aeeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6b28bce5f2f05ba21d6ca5… Author: Ambrož Bizjak <abizjak.pro(a)gmail.com> Date: Fri Nov 1 19:40:04 2019 +0100 ucrtbase: Implement t and j printf length modifiers. Signed-off-by: Ambroz Bizjak <abizjak.pro(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 6 +++++- dlls/ucrtbase/tests/printf.c | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 346fb5ac5d..975977087d 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -516,10 +516,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API } else if(*p == 'w') flags.WideString = *p++; #if _MSVCR_VER >= 140 - else if(*p == 'z') + else if(*p == 'z' || *p == 't') flags.IntegerNative = *p++; else if(*p == 'T') flags.NaturalString = *p++; + else if(*p == 'j') { + flags.IntegerDouble++; + p++; + } #endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 769121ebd9..2af29322bf 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <errno.h> #include <math.h> +#include <inttypes.h> #include "windef.h" #include "winbase.h" @@ -637,24 +638,35 @@ static void test_printf_legacy_three_digit_exp(void) static void test_printf_c99(void) { - char buf[20]; + char buf[30]; /* The msvcrt compatibility flag doesn't affect whether 'z' is interpreted * as size_t size for integers. */ - if (sizeof(void*) == 8) { - vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", - (size_t) 0x12345678123456, 1); - ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, - buf, sizeof(buf), "%zx %d", (size_t) 0x12345678123456, 1); - ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); - } else { - vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", - (size_t) 0x123456, 1); - ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, - buf, sizeof(buf), "%zx %d", (size_t) 0x123456, 1); - ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); + for (int i = 0; i < 2; i++) { + unsigned __int64 options = (i == 0) ? 0 : + UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; + + /* z modifier accepts size_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%zx %d", SIZE_MAX, 1); + if (sizeof(size_t) == 8) + ok(!strcmp(buf, "ffffffffffffffff 1"), "buf = %s\n", buf); + else + ok(!strcmp(buf, "ffffffff 1"), "buf = %s\n", buf); + + /* j modifier with signed format accepts intmax_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%jd %d", INTMAX_MIN, 1); + ok(!strcmp(buf, "-9223372036854775808 1"), "buf = %s\n", buf); + + /* j modifier with unsigned format accepts uintmax_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%ju %d", UINTMAX_MAX, 1); + ok(!strcmp(buf, "18446744073709551615 1"), "buf = %s\n", buf); + + /* t modifier accepts ptrdiff_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%td %d", PTRDIFF_MIN, 1); + if (sizeof(ptrdiff_t) == 8) + ok(!strcmp(buf, "-9223372036854775808 1"), "buf = %s\n", buf); + else + ok(!strcmp(buf, "-2147483648 1"), "buf = %s\n", buf); } }

1 0

Jacek Caban : vbscript: Support using function return value in expressions.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: ef737598e6b029a1af6c61e4cf8905c48ff63d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef737598e6b029a1af6c61e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:55:31 2019 +0100 vbscript: Support using function return value in expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 5 ++--- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8568b7098c..7339f42aba 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -104,9 +104,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if(invoke_type == VBDISP_LET - && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) - && !wcsicmp(name, ctx->func->name)) { + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; return S_OK; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5d8e02a7ab..4623a08e2b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1621,4 +1621,13 @@ with new TestPropSyntax ok .prop = 1, ".prop = "&.prop end with +function testsetresult(x, y) + set testsetresult = new TestPropSyntax + testsetresult.prop = x + y = testsetresult.prop + 1 +end function + +set x = testsetresult(1, 2) +ok x.prop = 1, "x.prop = " & x.prop + reportSuccess()

1 0

Jacek Caban : vbscript/tests: Add redim statement tests.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 39e79c76c9e6551f60dab5a35e2d865f8b90294f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e79c76c9e6551f60dab5a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:55:23 2019 +0100 vbscript/tests: Add redim statement tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 31 ++++++++++++++++++++++++++++++- dlls/vbscript/tests/run.c | 2 ++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8a6fa7834b..5d8e02a7ab 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -18,7 +18,7 @@ OPTION EXPLICIT : : DIM W -dim x, y, z +dim x, y, z, e Dim obj call ok(true, "true is not true?") @@ -1316,11 +1316,38 @@ end sub x = Array(1) changearg x(0) ok x(0) = 2, "x(0) = " & x(0) +ok getVT(x) = "VT_ARRAY|VT_VARIANT*", "getVT(x) after redim = " & getVT(x) x = Array(1) changearg (x(0)) ok x(0) = 1, "x(0) = " & x(0) +x = Array(1) +redim x(4) +ok ubound(x) = 4, "ubound(x) = " & ubound(x) +ok x(0) = empty, "x(0) = " & x(0) + +x = 1 +redim x(3) +ok ubound(x) = 3, "ubound(x) = " & ubound(x) + +x = Array(1, 2) +redim x(-1) +ok lbound(x) = 0, "lbound(x) = " & lbound(x) +ok ubound(x) = -1, "ubound(x) = " & ubound(x) + +redim x(3, 2) +ok ubound(x) = 3, "ubound(x) = " & ubound(x) +ok ubound(x, 1) = 3, "ubound(x, 1) = " & ubound(x, 1) +ok ubound(x, 2) = 2, "ubound(x, 2) = " & ubound(x, 2) & " expected 2" + +dim staticarray(4) +on error resume next +redim staticarray(3) +e = err.number +on error goto 0 +todo_wine_ok e = 10, "e = " & e + Class ArrClass Dim classarr(3) Dim classnoarr() @@ -1523,6 +1550,8 @@ sub test_dotIdentifiers Call ok(testObj.resume = 10, "testObj.resume = " & testObj.resume & " expected 10") Call ok(testObj.goto = 10, "testObj.goto = " & testObj.goto & " expected 10") Call ok(testObj.with = 10, "testObj.with = " & testObj.with & " expected 10") + Call ok(testObj.redim = 10, "testObj.redim = " & testObj.redim & " expected 10") + Call ok(testObj.preserve = 10, "testObj.preserve = " & testObj.preserve & " expected 10") end sub call test_dotIdentifiers diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 527055f83b..208d647d46 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -856,6 +856,8 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"on", DISPID_TESTOBJ_KEYWORD }, { L"resume", DISPID_TESTOBJ_KEYWORD }, { L"goto", DISPID_TESTOBJ_KEYWORD }, + { L"redim", DISPID_TESTOBJ_KEYWORD }, + { L"preserve", DISPID_TESTOBJ_KEYWORD }, { L"with", DISPID_TESTOBJ_KEYWORD } };

1 0

Jacek Caban : vbscript: Add interpreter support for redim statement.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 5cb1631fe221e981d68d7c1b1555c67f1cf6fd28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cb1631fe221e981d68d7c1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:51:11 2019 +0100 vbscript: Add interpreter support for redim statement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 20 +++++++++++++++ dlls/vbscript/interp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 86 insertions(+) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 07279794c6..90b0cf5342 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1122,6 +1122,23 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) return S_OK; } +static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *stat) +{ + unsigned arg_cnt; + HRESULT hres; + + if(stat->preserve) { + FIXME("Preserving redim not supported\n"); + return E_NOTIMPL; + } + + hres = compile_args(ctx, stat->dims, &arg_cnt); + if(FAILED(hres)) + return hres; + + return push_instr_bstr_uint(ctx, OP_redim, stat->identifier, arg_cnt); +} + static HRESULT compile_const_statement(compile_ctx_t *ctx, const_statement_t *stat) { const_decl_t *decl, *next_decl = stat->decls; @@ -1344,6 +1361,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_ONERROR: hres = compile_onerror_statement(ctx, (onerror_statement_t*)stat); break; + case STAT_REDIM: + hres = compile_redim_statement(ctx, (redim_statement_t*)stat); + break; case STAT_SELECT: hres = compile_select_statement(ctx, (select_statement_t*)stat); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 97360f9b22..8568b7098c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1145,6 +1145,71 @@ static HRESULT interp_dim(exec_ctx_t *ctx) return S_OK; } +static HRESULT array_bounds_from_stack(exec_ctx_t *ctx, unsigned dim_cnt, SAFEARRAYBOUND **ret) +{ + SAFEARRAYBOUND *bounds; + unsigned i; + int dim; + HRESULT hres; + + if(!(bounds = heap_alloc(dim_cnt * sizeof(*bounds)))) + return E_OUTOFMEMORY; + + for(i = 0; i < dim_cnt; i++) { + hres = to_int(stack_top(ctx, dim_cnt - i - 1), &dim); + if(FAILED(hres)) { + heap_free(bounds); + return hres; + } + + bounds[i].cElements = dim + 1; + bounds[i].lLbound = 0; + } + + stack_popn(ctx, dim_cnt); + *ret = bounds; + return S_OK; +} + +static HRESULT interp_redim(exec_ctx_t *ctx) +{ + BSTR identifier = ctx->instr->arg1.bstr; + const unsigned dim_cnt = ctx->instr->arg2.uint; + SAFEARRAYBOUND *bounds; + SAFEARRAY *array; + ref_t ref; + HRESULT hres; + + TRACE("%s %u\n", debugstr_w(identifier), dim_cnt); + + hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres); + return hres; + } + + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); + if(FAILED(hres)) + return hres; + + array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); + heap_free(bounds); + if(!array) + return E_OUTOFMEMORY; + + /* FIXME: We should check if we're not modifying an existing static array here */ + + VariantClear(ref.u.v); + V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(ref.u.v) = array; + return S_OK; +} + static HRESULT interp_step(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg2.bstr; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index fefed63edb..2d9647eb2e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -263,6 +263,7 @@ typedef enum { X(null, 1, 0, 0) \ X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ + X(redim, 1, ARG_BSTR, ARG_UINT) \ X(ret, 0, 0, 0) \ X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \

1 0

Jacek Caban : vbscript: Add parser support for redim statement.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 7e420a475e653f46970650dcbf65e860c1d3fc1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e420a475e653f46970650dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:50:57 2019 +0100 vbscript: Add parser support for redim statement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 2 ++ dlls/vbscript/parse.h | 8 ++++++++ dlls/vbscript/parser.y | 28 ++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index d8c5ed3004..f78eee4ff9 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -72,9 +72,11 @@ static const struct { {L"on", tON}, {L"option", tOPTION}, {L"or", tOR}, + {L"preserve", tPRESERVE}, {L"private", tPRIVATE}, {L"property", tPROPERTY}, {L"public", tPUBLIC}, + {L"redim", tREDIM}, {L"rem", tREM}, {L"resume", tRESUME}, {L"select", tSELECT}, diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f4f8a5e5e2..4bf82cbedb 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -120,6 +120,7 @@ typedef enum { STAT_FUNC, STAT_IF, STAT_ONERROR, + STAT_REDIM, STAT_SELECT, STAT_SET, STAT_STOP, @@ -165,6 +166,13 @@ typedef struct _dim_statement_t { dim_decl_t *dim_decls; } dim_statement_t; +typedef struct { + statement_t stat; + const WCHAR *identifier; + BOOL preserve; + expression_t *dims; +} redim_statement_t; + typedef struct _arg_decl_t { const WCHAR *name; BOOL by_ref; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8bb99f9f9a..46af0b16be 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -51,6 +51,7 @@ static statement_t *new_call_statement(parser_ctx_t*,BOOL,expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,expression_t*,expression_t*); static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); +static statement_t *new_redim_statement(parser_ctx_t*,const WCHAR*,BOOL,expression_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_foreach_statement(parser_ctx_t*,const WCHAR*,expression_t*,statement_t*); @@ -112,7 +113,8 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <string> tTRUE tFALSE %token <string> tNOT tAND tOR tXOR tEQV tIMP %token <string> tIS tMOD -%token <string> tCALL tDIM tSUB tFUNCTION tGET tLET tCONST +%token <string> tCALL tSUB tFUNCTION tGET tLET tCONST +%token <string> tDIM tREDIM tPRESERVE %token <string> tIF tELSE tELSEIF tEND tTHEN tEXIT %token <string> tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN %token <string> tSELECT tCASE tWITH @@ -133,7 +135,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression %type <expression> Arguments Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList -%type <boolean> OptionExplicit_opt DoType +%type <boolean> OptionExplicit_opt DoType Preserve_opt %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf @@ -194,6 +196,8 @@ SimpleStatement | CallExpression '=' Expression { $$ = new_assign_statement(ctx, $1, $3); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } + | tREDIM Preserve_opt tIdentifier '(' ArgumentList ')' + { $$ = new_redim_statement(ctx, $3, $2, $5); CHECK_ERROR; } | IfStatement { $$ = $1; } | tWHILE Expression StSep StatementsNl_opt tWEND { $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; } @@ -231,6 +235,10 @@ MemberExpression | tDOT DotIdentifier { expression_t *dot_expr = new_expression(ctx, EXPR_DOT, sizeof(*dot_expr)); CHECK_ERROR; $$ = new_member_expression(ctx, dot_expr, $2); CHECK_ERROR; } +Preserve_opt + : /* empty */ { $$ = FALSE; } + | tPRESERVE { $$ = TRUE; } + DimDeclList : DimDecl { $$ = $1; } | DimDecl ',' DimDeclList { $1->next = $3; $$ = $1; } @@ -537,6 +545,8 @@ DotIdentifier | tRESUME { $$ = $1; } | tGOTO { $$ = $1; } | tWITH { $$ = $1; } + | tREDIM { $$ = $1; } + | tPRESERVE { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep @@ -864,6 +874,20 @@ static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) return &stat->stat; } +static statement_t *new_redim_statement(parser_ctx_t *ctx, const WCHAR *identifier, BOOL preserve, expression_t *dims) +{ + redim_statement_t *stat; + + stat = new_statement(ctx, STAT_REDIM, sizeof(*stat)); + if(!stat) + return NULL; + + stat->identifier = identifier; + stat->preserve = preserve; + stat->dims = dims; + return &stat->stat; +} + static elseif_decl_t *new_elseif_decl(parser_ctx_t *ctx, expression_t *expr, statement_t *stat) { elseif_decl_t *decl;

1 0

Jacek Caban : vbscript: Allow 'with' as an identifier.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 37e27296076ee1067f5409d3fd408a11ef4e69b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e27296076ee1067f5409d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:50:45 2019 +0100 vbscript: Allow 'with' as an identifier. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/tests/run.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index ffa12b2c4e..8bb99f9f9a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -536,6 +536,7 @@ DotIdentifier | tON { $$ = $1; } | tRESUME { $$ = $1; } | tGOTO { $$ = $1; } + | tWITH { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0520038a02..8a6fa7834b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1522,6 +1522,7 @@ sub test_dotIdentifiers Call ok(testObj.on = 10, "testObj.on = " & testObj.on & " expected 10") Call ok(testObj.resume = 10, "testObj.resume = " & testObj.resume & " expected 10") Call ok(testObj.goto = 10, "testObj.goto = " & testObj.goto & " expected 10") + Call ok(testObj.with = 10, "testObj.with = " & testObj.with & " expected 10") end sub call test_dotIdentifiers diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 765a0353d1..527055f83b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -855,7 +855,8 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"next", DISPID_TESTOBJ_KEYWORD }, { L"on", DISPID_TESTOBJ_KEYWORD }, { L"resume", DISPID_TESTOBJ_KEYWORD }, - { L"goto", DISPID_TESTOBJ_KEYWORD } + { L"goto", DISPID_TESTOBJ_KEYWORD }, + { L"with", DISPID_TESTOBJ_KEYWORD } }; test_grfdex(grfdex, fdexNameCaseInsensitive);

1 0

Jacek Caban : vbscript: Add support for parameterized set statements.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: aad0340c8f339cd0a676d932e4c4d9394ccf2951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad0340c8f339cd0a676d932… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:50:37 2019 +0100 vbscript: Add support for parameterized set statements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 15 +++++---------- dlls/vbscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index ad6454aa57..97360f9b22 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -872,23 +872,18 @@ static HRESULT interp_set_ident(exec_ctx_t *ctx) DISPPARAMS dp; HRESULT hres; - TRACE("%s\n", debugstr_w(arg)); - - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } + TRACE("%s %u\n", debugstr_w(arg), arg_cnt); - hres = stack_assume_disp(ctx, 0, NULL); + hres = stack_assume_disp(ctx, arg_cnt, NULL); if(FAILED(hres)) return hres; - vbstack_to_dp(ctx, 0, TRUE, &dp); - hres = assign_ident(ctx, ctx->instr->arg1.bstr, DISPATCH_PROPERTYPUTREF, &dp); + vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); + hres = assign_ident(ctx, arg, DISPATCH_PROPERTYPUTREF, &dp); if(FAILED(hres)) return hres; - stack_popn(ctx, 1); + stack_popn(ctx, arg_cnt + 1); return S_OK; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9354cae309..765a0353d1 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -104,6 +104,8 @@ DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); +DEFINE_EXPECT(global_propargset_d); +DEFINE_EXPECT(global_propargset_i); DEFINE_EXPECT(global_testoptionalarg_i); DEFINE_EXPECT(global_testerrorobject_i); DEFINE_EXPECT(collectionobj_newenum_i); @@ -140,6 +142,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_GLOBALCALLBACK 1022 #define DISPID_GLOBAL_TESTERROROBJECT 1023 #define DISPID_GLOBAL_THROWWITHDESC 1024 +#define DISPID_GLOBAL_PROPARGSET 1025 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1101,6 +1104,7 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"RefObj", DISPID_GLOBAL_REFOBJ }, { L"propargput", DISPID_GLOBAL_PROPARGPUT, REF_EXPECT(global_propargput_d) }, { L"propargput1", DISPID_GLOBAL_PROPARGPUT1, REF_EXPECT(global_propargput1_d) }, + { L"propargset", DISPID_GLOBAL_PROPARGSET, REF_EXPECT(global_propargset_d) }, { L"counter", DISPID_GLOBAL_COUNTER }, { L"doubleAsString", DISPID_GLOBAL_DOUBLEASSTRING }, { L"testArray", DISPID_GLOBAL_TESTARRAY }, @@ -1389,6 +1393,27 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_PROPARGSET: + CHECK_EXPECT(global_propargset_i); + + ok(wFlags == DISPATCH_PROPERTYPUTREF, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_DISPATCH(pdp->rgvarg) == (IDispatch*)&testObj, "V_DISPATCH(psp->rgvargs) = %p\n", V_DISPATCH(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+1) == VT_I2, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I2(pdp->rgvarg+1) == 0, "V_I2(psp->rgvargs+1) = %d\n", V_I2(pdp->rgvarg+1)); + + return S_OK; + case DISPID_GLOBAL_COUNTER: ok(pdp != NULL, "pdp == NULL\n"); todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); @@ -2835,6 +2860,12 @@ static void run_tests(void) CHECK_CALLED(global_propargput1_d); CHECK_CALLED(global_propargput1_i); + SET_EXPECT(global_propargset_d); + SET_EXPECT(global_propargset_i); + parse_script_a("set propargset (counter()) = testObj"); + CHECK_CALLED(global_propargset_d); + CHECK_CALLED(global_propargset_i); + SET_EXPECT(testobj_propget_d); SET_EXPECT(testobj_propget_i); parse_script_a("dim x\nwith testObj\nx=1+.propget\nend with");

1 0

Vijay Kiran Kamuju : ucrtbase/tests: Add tests for strftime formats %r and %V.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: ea1398382c2ae319045fe7118fbaba0f9372f6d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1398382c2ae319045fe711… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Nov 1 10:16:05 2019 +0100 ucrtbase/tests: Add tests for strftime formats %r and %V. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 8a6fb7b8e1..3a1598fee2 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -904,6 +904,7 @@ static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; + const struct tm tm2 = { 0, 0, 14, 1, 0, 121, 6, 0, 0 }; char bufA[256]; size_t retA; int i; @@ -964,6 +965,14 @@ static void test_strftime(void) ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\n"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%r", &epoch); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "12:00:00 AM"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%r", &tm2); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "02:00:00 PM"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); @@ -984,6 +993,18 @@ static void test_strftime(void) ok(retA == 4, "expected 4, got %d\n", (int)retA); ok(!strcmp(bufA, "2016"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%V", &epoch); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm1); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "52"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm2); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "53"), "got %s\n", bufA); + for(i=0; i<14; i++) { __time32_t t = (365*2 + i - 7) * 24 * 60 * 60;

1 0

Byeongsik Jeon : po: Update Korean tranlation.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: fde9de91dfb7eb50c0e912a930c6739526b93ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde9de91dfb7eb50c0e912a9… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Fri Nov 1 16:58:15 2019 +0900 po: Update Korean tranlation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 688 ++++++++++++++++++++++----------------------------------------- 1 file changed, 239 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fde9de91dfb7eb50c0e9…

1 0

Fabian Maurer : find: Prevent hang by properly checking for EOF.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 93c98111aee7d96a1150657d9220d32f2f06e745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93c98111aee7d96a1150657d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Nov 1 16:02:41 2019 +0100 find: Prevent hang by properly checking for EOF. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/find/find.c b/programs/find/find.c index 3794a8190f..34ca2801eb 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -36,7 +36,7 @@ static BOOL read_char_from_handle(HANDLE handle, char *char_out) if (buffer_pos >= buffer_max) { BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); - if (!success) + if (!success || !buffer_max) return FALSE; buffer_pos = 0; }

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 November 2019