September 2011 - Wine-commits

Jacek Caban : vbscript: Added do while..loop statement implementation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 1f5c56d1a85c3508e6ba271479c572da8aaf35dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5c56d1a85c3508e6ba27147… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:30:09 2011 +0200 vbscript: Added do while..loop statement implementation. --- dlls/vbscript/compile.c | 1 + dlls/vbscript/parse.h | 3 ++- dlls/vbscript/parser.y | 2 ++ dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 814d9ea..e29513b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -661,6 +661,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; break; case STAT_WHILE: + case STAT_WHILELOOP: hres = compile_while_statement(ctx, (while_statement_t*)stat); break; default: diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index efd3d67..ff8c137 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -100,7 +100,8 @@ typedef enum { STAT_IF, STAT_SET, STAT_STOP, - STAT_WHILE + STAT_WHILE, + STAT_WHILELOOP } statement_type_t; typedef struct _statement_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d06c84f..c73f368 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -156,6 +156,8 @@ Statement | IfStatement { $$ = $1; } | tWHILE Expression tNL StatementsNl_opt tWEND { $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; } + | tDO tWHILE Expression tNL StatementsNl_opt tLOOP + { $$ = new_while_statement(ctx, STAT_WHILELOOP, $3, $5); CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d3886d6..da1e5cb 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -212,6 +212,19 @@ call ok((x and y), "x or y is false after while") while false wend +x = false +y = false +do while not (x and y) + if x then + y = true + end if + x = true +loop +call ok((x and y), "x or y is false after while") + +do while false +loop + if false then Sub testsub x = true

1 0

Jacek Caban : vbscript: Added support for exit do statement.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 9701bdb563046b1f7fa535882b4629c4b7417b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9701bdb563046b1f7fa535882… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:30:20 2011 +0200 vbscript: Added support for exit do statement. --- dlls/vbscript/compile.c | 31 ++++++++++++++++++++++++++++++- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 5 +++++ 4 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e29513b..61854e3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -38,6 +38,7 @@ typedef struct { unsigned labels_size; unsigned labels_cnt; + unsigned while_end_label; unsigned sub_end_label; unsigned func_end_label; unsigned prop_end_label; @@ -485,7 +486,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *stat) { - unsigned start_addr; + unsigned start_addr, prev_label; unsigned jmp_end; HRESULT hres; @@ -499,6 +500,12 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st if(jmp_end == -1) return E_OUTOFMEMORY; + if(stat->stat.type != STAT_WHILE) { + prev_label = ctx->while_end_label; + if((ctx->while_end_label = alloc_label(ctx)) == -1) + return E_OUTOFMEMORY; + } + hres = compile_statement(ctx, stat->body); if(FAILED(hres)) return hres; @@ -508,6 +515,12 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st return hres; instr_ptr(ctx, jmp_end)->arg1.uint = ctx->instr_cnt; + + if(stat->stat.type != STAT_WHILE) { + label_set_addr(ctx, ctx->while_end_label); + ctx->while_end_label = prev_label; + } + return S_OK; } @@ -594,6 +607,16 @@ static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement return S_OK; } +static HRESULT compile_exitdo_statement(compile_ctx_t *ctx) +{ + if(ctx->while_end_label == -1) { + FIXME("Exit Do outside Do Loop\n"); + return E_FAIL; + } + + return push_instr_addr(ctx, OP_jmp, ctx->while_end_label); +} + static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) { if(ctx->sub_end_label == -1) { @@ -639,6 +662,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_DIM: hres = compile_dim_statement(ctx, (dim_statement_t*)stat); break; + case STAT_EXITDO: + hres = compile_exitdo_statement(ctx); + break; case STAT_EXITFUNC: hres = compile_exitfunc_statement(ctx); break; @@ -698,6 +724,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; + ctx->while_end_label = -1; ctx->sub_end_label = -1; ctx->func_end_label = -1; ctx->prop_end_label = -1; @@ -732,6 +759,8 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(FAILED(hres)) return hres; + assert(ctx->while_end_label == -1); + if(ctx->sub_end_label != -1) label_set_addr(ctx, ctx->sub_end_label); if(ctx->func_end_label != -1) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ff8c137..5e9c9ae 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -93,6 +93,7 @@ typedef enum { STAT_ASSIGN, STAT_CALL, STAT_DIM, + STAT_EXITDO, STAT_EXITFUNC, STAT_EXITPROP, STAT_EXITSUB, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index c73f368..1bd8f58 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -159,6 +159,7 @@ Statement | tDO tWHILE Expression tNL StatementsNl_opt tLOOP { $$ = new_while_statement(ctx, STAT_WHILELOOP, $3, $5); CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } + | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0); CHECK_ERROR; } | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index da1e5cb..78083e6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -225,6 +225,11 @@ call ok((x and y), "x or y is false after while") do while false loop +do while true + exit do + ok false, "exit do didn't work" +loop + if false then Sub testsub x = true

1 0

Jacek Caban : vbscript: Added do until..loop statement implementation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 223a407a7fd399a983d93b8ea10da821bb7f24b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223a407a7fd399a983d93b8ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:30:31 2011 +0200 vbscript: Added do until..loop statement implementation. --- dlls/vbscript/compile.c | 3 ++- dlls/vbscript/interp.c | 25 +++++++++++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 11 ++++++++--- dlls/vbscript/tests/lang.vbs | 18 ++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 61854e3..5737676 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -496,7 +496,7 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st if(FAILED(hres)) return hres; - jmp_end = push_instr(ctx, OP_jmp_false); + jmp_end = push_instr(ctx, stat->stat.type == STAT_UNTIL ? OP_jmp_true : OP_jmp_false); if(jmp_end == -1) return E_OUTOFMEMORY; @@ -686,6 +686,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_STOP: hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; break; + case STAT_UNTIL: case STAT_WHILE: case STAT_WHILELOOP: hres = compile_while_statement(ctx, (while_statement_t*)stat); diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 474957c..c8e0514 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -611,6 +611,31 @@ static HRESULT interp_jmp_false(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_jmp_true(exec_ctx_t *ctx) +{ + const unsigned arg = ctx->instr->arg1.uint; + variant_val_t val; + HRESULT hres; + + TRACE("%u\n", arg); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + if(V_VT(val.v) != VT_BOOL) { + FIXME("unsupported for %s\n", debugstr_variant(val.v)); + release_val(&val); + return E_NOTIMPL; + } + + if(V_BOOL(val.v)) + instr_jmp(ctx, ctx->instr->arg1.uint); + else + ctx->instr++; + return S_OK; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 5e9c9ae..624e49f 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -101,6 +101,7 @@ typedef enum { STAT_IF, STAT_SET, STAT_STOP, + STAT_UNTIL, STAT_WHILE, STAT_WHILELOOP } statement_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 1bd8f58..820ae6c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -114,7 +114,7 @@ static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,u %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList -%type <bool> OptionExplicit_opt +%type <bool> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf @@ -156,8 +156,9 @@ Statement | IfStatement { $$ = $1; } | tWHILE Expression tNL StatementsNl_opt tWEND { $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; } - | tDO tWHILE Expression tNL StatementsNl_opt tLOOP - { $$ = new_while_statement(ctx, STAT_WHILELOOP, $3, $5); CHECK_ERROR; } + | tDO DoType Expression tNL StatementsNl_opt tLOOP + { $$ = new_while_statement(ctx, $2 ? STAT_WHILELOOP : STAT_UNTIL, $3, $5); + CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } @@ -175,6 +176,10 @@ DimDeclList /* FIXME: Support arrays */ : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } +DoType + : tWHILE { $$ = TRUE; } + | tUNTIL { $$ = FALSE; } + IfStatement : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 78083e6..8b1d1c3 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -230,6 +230,24 @@ do while true ok false, "exit do didn't work" loop +x = false +y = false +do until x and y + if x then + y = true + end if + x = true +loop +call ok((x and y), "x or y is false after do until") + +do until true +loop + +do until false + exit do + ok false, "exit do didn't work" +loop + if false then Sub testsub x = true diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a2c23ea..12315ae 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -167,6 +167,7 @@ typedef enum { X(imp, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ + X(jmp_true, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ X(mcall, 1, ARG_BSTR, ARG_UINT) \ X(mcallv, 1, ARG_BSTR, ARG_UINT) \

1 0

Jacek Caban : vbscript: Added do..while and do.. until statements implementation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 004210f1fb4abe85fd62a37a915696b66502a372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=004210f1fb4abe85fd62a37a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:30:39 2011 +0200 vbscript: Added do..while and do..until statements implementation. --- dlls/vbscript/compile.c | 34 +++++++++++++++++++++++++++++++++- dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 3 +++ dlls/vbscript/tests/lang.vbs | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 5737676..1ff3c40 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -211,7 +211,7 @@ static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) return NULL; ctx->code->bstr_pool_size = 8; }else if(ctx->code->bstr_pool_size == ctx->code->bstr_cnt) { - BSTR *new_pool; + BSTR *new_pool; new_pool = heap_realloc(ctx->code->bstr_pool, ctx->code->bstr_pool_size*2*sizeof(BSTR)); if(!new_pool) @@ -524,6 +524,34 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st return S_OK; } +static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t *stat) +{ + unsigned start_addr, prev_label; + HRESULT hres; + + start_addr = ctx->instr_cnt; + + prev_label = ctx->while_end_label; + if((ctx->while_end_label = alloc_label(ctx)) == -1) + return E_OUTOFMEMORY; + + hres = compile_statement(ctx, stat->body); + if(FAILED(hres)) + return hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + hres = push_instr_addr(ctx, stat->stat.type == STAT_DOUNTIL ? OP_jmp_false : OP_jmp_true, start_addr); + if(FAILED(hres)) + return hres; + + label_set_addr(ctx, ctx->while_end_label); + ctx->while_end_label = prev_label; + return S_OK; +} + static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) { HRESULT hres; @@ -662,6 +690,10 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_DIM: hres = compile_dim_statement(ctx, (dim_statement_t*)stat); break; + case STAT_DOWHILE: + case STAT_DOUNTIL: + hres = compile_dowhile_statement(ctx, (while_statement_t*)stat); + break; case STAT_EXITDO: hres = compile_exitdo_statement(ctx); break; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 624e49f..d121b72 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -93,6 +93,8 @@ typedef enum { STAT_ASSIGN, STAT_CALL, STAT_DIM, + STAT_DOUNTIL, + STAT_DOWHILE, STAT_EXITDO, STAT_EXITFUNC, STAT_EXITPROP, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 820ae6c..b1b385b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -159,6 +159,9 @@ Statement | tDO DoType Expression tNL StatementsNl_opt tLOOP { $$ = new_while_statement(ctx, $2 ? STAT_WHILELOOP : STAT_UNTIL, $3, $5); CHECK_ERROR; } + | tDO tNL StatementsNl_opt tLOOP DoType Expression + { $$ = new_while_statement(ctx, $5 ? STAT_DOWHILE : STAT_DOUNTIL, $6, $3); + CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8b1d1c3..c62f17f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -248,6 +248,42 @@ do until false ok false, "exit do didn't work" loop +x = false +y = false +do + if x then + y = true + end if + x = true +loop until x and y +call ok((x and y), "x or y is false after while") + +do +loop until true + +do + exit do + ok false, "exit do didn't work" +loop until false + +x = false +y = false +do + if x then + y = true + end if + x = true +loop while not (x and y) +call ok((x and y), "x or y is false after while") + +do +loop while false + +do + exit do + ok false, "exit do didn't work" +loop while true + if false then Sub testsub x = true

1 0

Jacek Caban : vbscript: Added VBScript_Global typelib.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 19a85797abdaddf38768b453954c1c02c9652df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a85797abdaddf38768b4539… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 16:56:24 2011 +0200 vbscript: Added VBScript_Global typelib. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/vbscript_defs.h | 220 ++++++++++++ dlls/vbscript/vbsglobal.idl | 755 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 976 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19a85797abdaddf38768b…

1 0

Frédéric Delanoy : cmd: Remove unused declarations of echo_mode.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: bf63385fabaabae68d74b1771673f93c9f5836b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf63385fabaabae68d74b1771… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 16 08:44:05 2011 +0200 cmd: Remove unused declarations of echo_mode. --- programs/cmd/batch.c | 1 - programs/cmd/directory.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 881c7d1..f988d95 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -24,7 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern int echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 1863690..0b5df04 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); - -extern int echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern DWORD errorlevel;

1 0

Frédéric Delanoy : cmd: echo_mode has BOOL type instead of int.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: b3561bf82e8e8599797826c5c0b4b730c5af9b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3561bf82e8e8599797826c5c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 16 08:44:06 2011 +0200 cmd: echo_mode has BOOL type instead of int. --- programs/cmd/builtins.c | 7 ++++--- programs/cmd/wcmdmain.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1e3defa..9c16e8f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -50,7 +50,8 @@ struct env_stack *pushd_directories; extern HINSTANCE hinst; extern WCHAR inbuilt[][10]; -extern int echo_mode, verify_mode, defaultColor; +extern int verify_mode, defaultColor; +extern BOOL echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; @@ -876,11 +877,11 @@ void WCMD_echo (const WCHAR *command) { return; } if (lstrcmpiW(command, onW) == 0) { - echo_mode = 1; + echo_mode = TRUE; return; } if (lstrcmpiW(command, offW) == 0) { - echo_mode = 0; + echo_mode = FALSE; return; } WCMD_output_asis (command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 02260e3..beca20e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -86,7 +86,8 @@ const WCHAR externals[NUM_EXTERNALS][10] = { HINSTANCE hinst; DWORD errorlevel; -int echo_mode = 1, verify_mode = 0, defaultColor = 7; +int verify_mode = 0, defaultColor = 7; +BOOL echo_mode = TRUE; static int opt_c, opt_k, opt_s; const WCHAR newline[] = {'\r','\n','\0'}; static const WCHAR equalsW[] = {'=','\0'}; @@ -1233,7 +1234,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, CMD_LIST **cmdList) { WCHAR *cmd, *p, *redir; - int status, i, prev_echo_mode; + int status, i; DWORD count, creationDisposition; HANDLE h; WCHAR *whichcmd; @@ -1246,7 +1247,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE}; - BOOL piped = FALSE; + BOOL prev_echo_mode, piped = FALSE; WINE_TRACE("command on entry:%s (%p), with forVariable '%s'='%s'\n", wine_dbgstr_w(command), cmdList,

1 0

Frédéric Delanoy : cmd: verify_mode has BOOL type instead of int.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: c4db72f50e16ff51a05a55bf9a91b9517d10c29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4db72f50e16ff51a05a55bf9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 16 08:44:07 2011 +0200 cmd: verify_mode has BOOL type instead of int. --- programs/cmd/builtins.c | 8 +++++--- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9c16e8f..99a2314 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -50,12 +50,14 @@ struct env_stack *pushd_directories; extern HINSTANCE hinst; extern WCHAR inbuilt[][10]; -extern int verify_mode, defaultColor; +extern int defaultColor; extern BOOL echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; +static BOOL verify_mode = FALSE; + static const WCHAR dotW[] = {'.','\0'}; static const WCHAR dotdotW[] = {'.','.','\0'}; static const WCHAR slashW[] = {'\\','\0'}; @@ -2617,11 +2619,11 @@ void WCMD_verify (const WCHAR *command) { return; } if (lstrcmpiW(command, onW) == 0) { - verify_mode = 1; + verify_mode = TRUE; return; } else if (lstrcmpiW(command, offW) == 0) { - verify_mode = 0; + verify_mode = FALSE; return; } else WCMD_output (WCMD_LoadMessage(WCMD_VERIFYERR)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index beca20e..92b76fc 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -86,7 +86,7 @@ const WCHAR externals[NUM_EXTERNALS][10] = { HINSTANCE hinst; DWORD errorlevel; -int verify_mode = 0, defaultColor = 7; +int defaultColor = 7; BOOL echo_mode = TRUE; static int opt_c, opt_k, opt_s; const WCHAR newline[] = {'\r','\n','\0'};

1 0

Piotr Caban : urlmon: Added 331 and 335 ordinal exports.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 4856bd10157c784f60859d5b95af2e3698bc2e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4856bd10157c784f60859d5b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 16 11:21:03 2011 +0200 urlmon: Added 331 and 335 ordinal exports. --- dlls/urlmon/urlmon.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 1a409c3..41bd263 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -94,6 +94,8 @@ @ stub WriteHitLogging @ stub ZonesReInit +331 stdcall @(ptr long ptr) propsys.InitPropVariantFromBuffer +335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString 410 stdcall @(long long) URLMON_410 423 stdcall @(long long long long) URLMON_423

1 0

Piotr Caban : urlmon: Added 111 ordinal stub.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 005808cb0e4a75a15820024ea7f83bc2d45aeb32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005808cb0e4a75a15820024ea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 16 11:21:24 2011 +0200 urlmon: Added 111 ordinal stub. --- dlls/urlmon/urlmon.spec | 1 + dlls/urlmon/urlmon_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 41bd263..28af3c5 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -94,6 +94,7 @@ @ stub WriteHitLogging @ stub ZonesReInit +111 stdcall @(wstr) IsProtectedModeURL 331 stdcall @(ptr long ptr) propsys.InitPropVariantFromBuffer 335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 01442c1..5ba9c00 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -907,6 +907,16 @@ BOOL WINAPI IsLoggingEnabledW(LPCWSTR url) } /*********************************************************************** + * IsProtectedModeURL (URLMON.111) + * Undocumented, added in IE7 + */ +BOOL WINAPI IsProtectedModeURL(const WCHAR *url) +{ + FIXME("stub: %s\n", debugstr_w(url)); + return TRUE; +} + +/*********************************************************************** * URLMON_410 (URLMON.410) * Undocumented, added in IE8 */

1 0