November 2011 - Wine-commits

Jacek Caban : jscript: Use bytecode for binary or implementation.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 96b13314eb450a98dd1360e2d98f1a46e49b3485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b13314eb450a98dd1360e2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 29 11:09:35 2011 +0100 jscript: Use bytecode for binary or implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 29 ++++++++++++++++++++++++++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4793fa3..7520756 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -346,6 +346,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); + case EXPR_BOR: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_COMMA: return compile_comma_expression(ctx, (binary_expression_t*)expr); case EXPR_COND: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1cdc4d0..16a3a06 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -94,6 +94,15 @@ static inline HRESULT stack_push_number(exec_ctx_t *ctx, double number) return stack_push(ctx, &v); } +static inline HRESULT stack_push_int(exec_ctx_t *ctx, INT n) +{ + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = n; + return stack_push(ctx, &v); +} + static inline VARIANT *stack_top(exec_ctx_t *ctx) { assert(ctx->top); @@ -129,6 +138,11 @@ static HRESULT stack_pop_number(exec_ctx_t *ctx, VARIANT *r) return hres; } +static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) +{ + return to_int32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); +} + static void exprval_release(exprval_t *val) { switch(val->type) { @@ -2009,13 +2023,22 @@ static HRESULT bitor_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexc } /* ECMA-262 3rd Edition 11.10 */ -HRESULT binary_or_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_or(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + INT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, bitor_eval, ei, ret); + hres = stack_pop_int(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l|r); } /* ECMA-262 3rd Edition 11.10 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 5ef2002..6ac6d23 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -63,6 +63,7 @@ typedef struct _func_stack { X(neq2, 1, 0,0) \ X(new, 1, ARG_INT, 0) \ X(null, 1, 0,0) \ + X(or, 1, 0,0) \ X(pop, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(str, 1, ARG_STR, 0) \ @@ -554,7 +555,6 @@ HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 36f8f19..fecde80 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1308,7 +1308,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - binary_or_expression_eval, + compiled_expression_eval, binary_xor_expression_eval, binary_and_expression_eval, instanceof_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for binary xor expressions.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 0505e03b570fbdc27f97f605375adfa4338581b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0505e03b570fbdc27f97f6053… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 29 11:09:49 2011 +0100 jscript: Use bytecode for binary xor expressions. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 15 ++++++++++++--- dlls/jscript/engine.h | 4 ++-- dlls/jscript/parser.y | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 7520756..b7abdda 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -388,6 +388,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_this) == -1 ? E_OUTOFMEMORY : S_OK; case EXPR_VOID: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_void); + case EXPR_BXOR: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); default: assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 16a3a06..2d766e4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2061,13 +2061,22 @@ static HRESULT xor_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.10 */ -HRESULT binary_xor_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_xor(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + INT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, xor_eval, ei, ret); + hres = stack_pop_int(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l^r); } /* ECMA-262 3rd Edition 11.10 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6ac6d23..58f12c7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -72,7 +72,8 @@ typedef struct _func_stack { X(tree, 1, ARG_EXPR, 0) \ X(ret, 0, 0,0) \ X(sub, 1, 0,0) \ - X(void, 1, 0,0) + X(void, 1, 0,0) \ + X(xor, 1, 0,0) typedef enum { #define X(x,a,b,c) OP_##x, @@ -555,7 +556,6 @@ HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index fecde80..0912107 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1309,7 +1309,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - binary_xor_expression_eval, + compiled_expression_eval, binary_and_expression_eval, instanceof_expression_eval, compiled_expression_eval,

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetBool().
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 4b42b1130357f8f4674fce36db50a71a7c3c6564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b42b1130357f8f4674fce36d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 29 10:04:10 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetBool(). --- dlls/d3dx9_36/effect.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 619d184..c2be558 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1656,10 +1656,19 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL b) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, b %u stub\n", This, parameter, b); + TRACE("iface %p, parameter %p, b %s\n", This, parameter, b ? "TRUE" : "FALSE"); - return E_NOTIMPL; + if (param && !param->element_count && param->rows == 1 && param->columns == 1) + { + set_number(param->data, param->type, &b, D3DXPT_BOOL); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetBool(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL *b)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetBoolArray().
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 0ca1efc5786423eb382629cfed9ace4160a59117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca1efc5786423eb382629cfe… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 29 10:04:19 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetBoolArray(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c2be558..2e8b674 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1693,10 +1693,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetBool(ID3DXBaseEffect *iface, D3DXHA static HRESULT WINAPI ID3DXBaseEffectImpl_SetBoolArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST BOOL *b, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, b %p, count %u stub\n", This, parameter, b, count); + TRACE("iface %p, parameter %p, b %p, count %u\n", This, parameter, b, count); - return E_NOTIMPL; + if (param) + { + UINT i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + { + set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_BOOL); + } + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetBoolArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrix().
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: cebdbb34ac2dee2582c29258dbf16302841850aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cebdbb34ac2dee2582c29258d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 29 10:04:23 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetMatrix(). --- dlls/d3dx9_36/effect.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2e8b674..3079bc0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -935,6 +935,20 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) } } +static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) +{ + unsigned int i, k; + + for (i = 0; i < 4; ++i) + { + for (k = 0; k < 4; ++k) + { + if ((i < param->rows) && (k < param->columns)) + set_number((float *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); + } + } +} + static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, LPCSTR name) { UINT element; @@ -2077,10 +2091,35 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetVectorArray(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p stub\n", This, parameter, matrix); + TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); - return E_NOTIMPL; + if (param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_matrix(param, matrix); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixArray().
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 84f158025b7a5237f1050f01f5d825ced8b3d2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f158025b7a5237f1050f01f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 29 10:04:27 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetMatrixArray(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3079bc0..4d08180 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2159,10 +2159,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (param && param->element_count >= count) + { + UINT i; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + set_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count)

1 0

Francois Gouget : cmd/tests: Treat lines that start with '---' as resynchronization points.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 81f64ee906888875de10a4c804bed88c103a282c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f64ee906888875de10a4c80… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 29 11:44:37 2011 +0100 cmd/tests: Treat lines that start with '---' as resynchronization points. --- programs/cmd/tests/batch.c | 32 +++++++++++++++++++++++------ programs/cmd/tests/test_builtins.cmd | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 8347c03..8236352 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -276,7 +276,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err; DWORD line = 0; static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; - BOOL is_todo_wine; + static const char resync_cmd[] = {'-','-','-'}; + BOOL is_todo_wine, is_out_resync, is_exp_resync; while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { line++; @@ -290,6 +291,10 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da exp_ptr += sizeof(todo_wine_cmd); winetest_start_todo("wine"); } + is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && + !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); + is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && + !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); if(err == out_nl) @@ -298,18 +303,31 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da else if(err == exp_nl) ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if (!err && is_todo_wine && is_out_resync && is_exp_resync) + /* Consider that the todo_wine was to deal with extra lines, + * not for the resync line itself + */ + err = NULL; else ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); if(is_todo_wine) winetest_end_todo("wine"); - exp_ptr = exp_nl+1; - out_ptr = out_nl+1; - if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n') - out_ptr++; - if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') - exp_ptr++; + if (is_exp_resync && err && is_todo_wine) + exp_ptr -= sizeof(todo_wine_cmd); + else if (!is_exp_resync || (is_exp_resync && !err)) + { + exp_ptr = exp_nl+1; + if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') + exp_ptr++; + } + if (!is_out_resync || (is_out_resync && !err)) + { + out_ptr = out_nl+1; + if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n') + out_ptr++; + } } ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bcaccb2..1734650 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -164,7 +164,7 @@ type C (if 1==0 (echo A > B) else echo C) cd .. & rd /s/q foobar -echo ------------ Testing ^^ escape character -------------- +echo ------------ Testing circumflex escape character -------------- rem Using something like "echo foo^" asks for an additional char after a "More?" prompt on the following line; it's not possible to currently test that non-interactively echo ^hell^o, world echo hell^o, world diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e35b710..68355c4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -178,7 +178,7 @@ foo A B C -(a)todo_wine@------------ Testing ^ escape character -------------- +------------ Testing circumflex escape character -------------- @todo_wine(a)hello, world @todo_wine(a)hello, world @todo_wine(a)hell^o, world

1 0

Francois Gouget : cmd/tests: Standardize the batch file section headers.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 128d0656de78c6c850e4774ad3fad64a06f54cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=128d0656de78c6c850e4774ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 29 11:45:51 2011 +0100 cmd/tests: Standardize the batch file section headers. --- programs/cmd/tests/test_builtins.cmd | 52 +++++++++++++++--------------- programs/cmd/tests/test_builtins.cmd.exp | 52 +++++++++++++++--------------- 2 files changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=128d0656de78c6c850e47…

1 0

Henri Verbeet : ddraw: Create the wined3d swapchain when setting the cooperative level.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 0f10ac93580d5a055f0b3f6e7c3d77738135f031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f10ac93580d5a055f0b3f6e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 28 21:30:57 2011 +0100 ddraw: Create the wined3d swapchain when setting the cooperative level. --- dlls/ddraw/ddraw.c | 280 +++++++++++++++++++++----------------------- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/device.c | 4 +- dlls/ddraw/surface.c | 11 -- dlls/ddraw/tests/d3d.c | 4 +- 5 files changed, 136 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f10ac93580d5a055f0b3…

1 0

Henri Verbeet : ddraw: Rename the wineD3D field in IDirectDrawImpl to wined3d.
by Alexandre Julliard 29 Nov '11

29 Nov '11

Module: wine Branch: master Commit: 22d41e2c3f39a871cfd12bb06ce7ddd48390e088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d41e2c3f39a871cfd12bb06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 28 21:30:58 2011 +0100 ddraw: Rename the wineD3D field in IDirectDrawImpl to wined3d. --- dlls/ddraw/ddraw.c | 28 ++++++++++++++-------------- dlls/ddraw/ddraw_private.h | 3 +-- dlls/ddraw/device.c | 10 +++++----- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 45496f6..dfe7b37 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -486,7 +486,7 @@ static void ddraw_destroy(IDirectDrawImpl *This) if (This->wined3d_swapchain) ddraw_destroy_swapchain(This); wined3d_device_decref(This->wined3d_device); - wined3d_decref(This->wineD3D); + wined3d_decref(This->wined3d); /* Now free the object */ HeapFree(GetProcessHeap(), 0, This); @@ -835,7 +835,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, { struct wined3d_display_mode display_mode; - wined3d_get_adapter_display_mode(This->wineD3D, WINED3DADAPTER_DEFAULT, &display_mode); + wined3d_get_adapter_display_mode(This->wined3d, WINED3DADAPTER_DEFAULT, &display_mode); wined3d_device_setup_fullscreen_window(This->wined3d_device, hwnd, display_mode.width, display_mode.height); } @@ -1453,7 +1453,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); ++i) { - hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, + hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, mode.format_id, 0, WINED3DRTYPE_SURFACE, formats[i], DefaultSurfaceType); if (SUCCEEDED(hr)) { @@ -1652,7 +1652,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C { struct wined3d_adapter_identifier desc = {0}; - hr = wined3d_get_adapter_identifier(This->wineD3D, WINED3DADAPTER_DEFAULT, 0, &desc); + hr = wined3d_get_adapter_identifier(This->wined3d, WINED3DADAPTER_DEFAULT, 0, &desc); *total = desc.video_memory; } @@ -2135,7 +2135,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) { modenum = 0; - while (wined3d_enum_adapter_modes(This->wineD3D, WINED3DADAPTER_DEFAULT, + while (wined3d_enum_adapter_modes(This->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], modenum++, &mode) == WINED3D_OK) { PixelFormat_WineD3DtoDD(&pixelformat, mode.format_id); @@ -3851,7 +3851,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA wined3d_mutex_lock(); - hr = IDirect3DImpl_GetCaps(This->wineD3D, &device_desc1, &device_desc7); + hr = IDirect3DImpl_GetCaps(This->wined3d, &device_desc1, &device_desc7); if (hr != D3D_OK) { wined3d_mutex_unlock(); @@ -3918,7 +3918,7 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA wined3d_mutex_lock(); - hr = IDirect3DImpl_GetCaps(This->wineD3D, &device_desc1, &device_desc7); + hr = IDirect3DImpl_GetCaps(This->wined3d, &device_desc1, &device_desc7); if (hr != D3D_OK) { wined3d_mutex_unlock(); @@ -4282,7 +4282,7 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd } /* Get the caps */ - hr = IDirect3DImpl_GetCaps(This->wineD3D, &desc1, &desc7); + hr = IDirect3DImpl_GetCaps(This->wined3d, &desc1, &desc7); if (hr != D3D_OK) return hr; /* Now return our own GUID */ @@ -4594,7 +4594,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) { - hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, type, mode.format_id, + hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, WINED3DUSAGE_DEPTHSTENCIL, WINED3DRTYPE_SURFACE, formats[i], SURFACE_OPENGL); if (SUCCEEDED(hr)) { @@ -4619,7 +4619,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device * while others used dwZBufferBitDepth=32. In either case the pitch matches a 32 bits per * pixel format, so we use dwZBufferBitDepth=32. Some games expect 24. Windows Vista and * newer enumerate both versions, so we do the same(bug 22434) */ - hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, type, mode.format_id, + hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, WINED3DUSAGE_DEPTHSTENCIL, WINED3DRTYPE_SURFACE, WINED3DFMT_X8D24_UNORM, SURFACE_OPENGL); if (SUCCEEDED(hr)) { @@ -5455,20 +5455,20 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - ddraw->wineD3D = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS, + ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS, &ddraw->IDirectDraw7_iface); - if (!ddraw->wineD3D) + if (!ddraw->wined3d) { WARN("Failed to create a wined3d object.\n"); return E_OUTOFMEMORY; } - hr = wined3d_device_create(ddraw->wineD3D, WINED3DADAPTER_DEFAULT, device_type, + hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, NULL, 0, 8, &ddraw->device_parent, &ddraw->wined3d_device); if (FAILED(hr)) { WARN("Failed to create a wined3d device, hr %#x.\n", hr); - wined3d_decref(ddraw->wineD3D); + wined3d_decref(ddraw->wined3d); return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a4522b0..b85ea4a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -80,8 +80,7 @@ struct IDirectDrawImpl LONG ref7, ref4, ref2, ref3, ref1, numIfaces; BOOL initialized; - /* WineD3D linkage */ - struct wined3d *wineD3D; + struct wined3d *wined3d; struct wined3d_device *wined3d_device; BOOL d3d_initialized; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 462f39e..e9e7744 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -460,7 +460,7 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface, TRACE("iface %p, device_desc %p.\n", iface, Desc); /* Call the same function used by IDirect3D, this saves code */ - return IDirect3DImpl_GetCaps(This->ddraw->wineD3D, &OldDesc, Desc); + return IDirect3DImpl_GetCaps(This->ddraw->wined3d, &OldDesc, Desc); } static HRESULT WINAPI @@ -511,7 +511,7 @@ IDirect3DDeviceImpl_3_GetCaps(IDirect3DDevice3 *iface, TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, HWDesc, HelDesc); - hr = IDirect3DImpl_GetCaps(This->ddraw->wineD3D, HWDesc, &newDesc); + hr = IDirect3DImpl_GetCaps(This->ddraw->wined3d, HWDesc, &newDesc); if(hr != D3D_OK) return hr; *HelDesc = *HWDesc; @@ -1103,7 +1103,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) { - hr = wined3d_check_device_format(This->ddraw->wineD3D, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, + hr = wined3d_check_device_format(This->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, mode.format_id, 0, WINED3DRTYPE_TEXTURE, FormatList[i], SURFACE_OPENGL); if (hr == D3D_OK) { @@ -1126,7 +1126,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, for (i = 0; i < sizeof(BumpFormatList) / sizeof(*BumpFormatList); ++i) { - hr = wined3d_check_device_format(This->ddraw->wineD3D, WINED3DADAPTER_DEFAULT, + hr = wined3d_check_device_format(This->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, mode.format_id, WINED3DUSAGE_QUERY_LEGACYBUMPMAP, WINED3DRTYPE_TEXTURE, BumpFormatList[i], SURFACE_OPENGL); if (hr == D3D_OK) @@ -1240,7 +1240,7 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) { - hr = wined3d_check_device_format(This->ddraw->wineD3D, 0, WINED3DDEVTYPE_HAL, + hr = wined3d_check_device_format(This->ddraw->wined3d, 0, WINED3DDEVTYPE_HAL, mode.format_id, 0, WINED3DRTYPE_TEXTURE, FormatList[i], SURFACE_OPENGL); if (hr == D3D_OK) {

1 0