July 2012 - Wine-commits - list.winehq.org

Jacek Caban : vbscript: Added a hack for parameterized assignments with one argument.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: e56a5907a3b7794a4014114a844726b7377c2395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e56a5907a3b7794a4014114a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 17:04:51 2012 +0200 vbscript: Added a hack for parameterized assignments with one argument. --- dlls/vbscript/compile.c | 41 ++++++++++++++++++++++++++++++++++------- dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 11 ++++++----- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index f3d88a0..28d1280 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -421,6 +421,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_and); case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + case EXPR_BRACKETS: + return compile_expression(ctx, ((unary_expression_t*)expr)->subexpr); case EXPR_CONCAT: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); case EXPR_DIV: @@ -691,14 +693,14 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return push_instr_uint(ctx, OP_pop, 2); } -static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) +static HRESULT compile_assignment(compile_ctx_t *ctx, member_expression_t *member_expr, expression_t *value_expr, BOOL is_set) { unsigned args_cnt; vbsop_t op; HRESULT hres; - if(stat->member_expr->obj_expr) { - hres = compile_expression(ctx, stat->member_expr->obj_expr); + if(member_expr->obj_expr) { + hres = compile_expression(ctx, member_expr->obj_expr); if(FAILED(hres)) return hres; @@ -707,15 +709,40 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * op = is_set ? OP_set_ident : OP_assign_ident; } - hres = compile_expression(ctx, stat->value_expr); + hres = compile_expression(ctx, value_expr); if(FAILED(hres)) return hres; - hres = compile_args(ctx, stat->member_expr->args, &args_cnt); + hres = compile_args(ctx, member_expr->args, &args_cnt); if(FAILED(hres)) return hres; - return push_instr_bstr_uint(ctx, op, stat->member_expr->identifier, args_cnt); + return push_instr_bstr_uint(ctx, op, member_expr->identifier, args_cnt); +} + +static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) +{ + return compile_assignment(ctx, stat->member_expr, stat->value_expr, is_set); +} + +static HRESULT compile_call_statement(compile_ctx_t *ctx, call_statement_t *stat) +{ + /* It's challenging for parser to distinguish parameterized assignment with one argument from call + * with equality expression argument, so we do it in compiler. */ + if(!stat->is_strict && stat->expr->args && !stat->expr->args->next && stat->expr->args->type == EXPR_EQUAL) { + binary_expression_t *eqexpr = (binary_expression_t*)stat->expr->args; + + if(eqexpr->left->type == EXPR_BRACKETS) { + member_expression_t new_member = *stat->expr; + + WARN("converting call expr to assign expr\n"); + + new_member.args = ((unary_expression_t*)eqexpr->left)->subexpr; + return compile_assignment(ctx, &new_member, eqexpr->right, FALSE); + } + } + + return compile_member_expression(ctx, stat->expr, FALSE); } static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) @@ -874,7 +901,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) hres = compile_assign_statement(ctx, (assign_statement_t*)stat, FALSE); break; case STAT_CALL: - hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); + hres = compile_call_statement(ctx, (call_statement_t*)stat); break; case STAT_CONST: hres = compile_const_statement(ctx, (const_statement_t*)stat); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index b97ee13..50151d3 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -20,6 +20,7 @@ typedef enum { EXPR_ADD, EXPR_AND, EXPR_BOOL, + EXPR_BRACKETS, EXPR_CONCAT, EXPR_DIV, EXPR_DOUBLE, @@ -127,6 +128,7 @@ typedef struct _statement_t { typedef struct { statement_t stat; member_expression_t *expr; + BOOL is_strict; } call_statement_t; typedef struct { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a5f7405..fca0cf1 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -47,7 +47,7 @@ static expression_t *new_new_expression(parser_ctx_t*,const WCHAR*); static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); static void *new_statement(parser_ctx_t*,statement_type_t,size_t); -static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); +static statement_t *new_call_statement(parser_ctx_t*,BOOL,member_expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); @@ -166,8 +166,8 @@ Statement | SimpleStatement ':' { $$ = $1; } SimpleStatement - : MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } - | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } + : MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, FALSE, $1); CHECK_ERROR; } + | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, TRUE, $2); CHECK_ERROR; } | MemberExpression Arguments_opt '=' Expression { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } @@ -349,7 +349,7 @@ LiteralExpression | tNOTHING { $$ = new_expression(ctx, EXPR_NOTHING, 0); CHECK_ERROR; } PrimaryExpression - : '(' Expression ')' { $$ = $2; } + : '(' Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } | tME { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; } ClassDeclaration @@ -558,7 +558,7 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size return stat; } -static statement_t *new_call_statement(parser_ctx_t *ctx, member_expression_t *expr) +static statement_t *new_call_statement(parser_ctx_t *ctx, BOOL is_strict, member_expression_t *expr) { call_statement_t *stat; @@ -567,6 +567,7 @@ static statement_t *new_call_statement(parser_ctx_t *ctx, member_expression_t *e return NULL; stat->expr = expr; + stat->is_strict = is_strict; return &stat->stat; }

1 0

Jacek Caban : vbscript: Added more parameterized assignment tests.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: ef6a6b08d446e6fc97632596ddb38b71e1b92eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6a6b08d446e6fc97632596d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 17:05:04 2012 +0200 vbscript: Added more parameterized assignment tests. --- dlls/vbscript/tests/run.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 861ec7b..e52e5ba 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -63,6 +63,8 @@ DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); +DEFINE_EXPECT(global_propargput1_d); +DEFINE_EXPECT(global_propargput1_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -74,8 +76,9 @@ DEFINE_EXPECT(global_propargput_i); #define DISPID_GLOBAL_ISNULLDISP 1007 #define DISPID_GLOBAL_TESTDISP 1008 #define DISPID_GLOBAL_REFOBJ 1009 -#define DISPID_GLOBAL_PROPARGPUT 1010 -#define DISPID_GLOBAL_COUNTER 1011 +#define DISPID_GLOBAL_COUNTER 1010 +#define DISPID_GLOBAL_PROPARGPUT 1011 +#define DISPID_GLOBAL_PROPARGPUT1 1012 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -609,6 +612,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_PROPARGPUT; return S_OK; } + if(!strcmp_wa(bstrName, "propargput1")) { + CHECK_EXPECT(global_propargput1_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_PROPARGPUT1; + return S_OK; + } if(!strcmp_wa(bstrName, "counter")) { test_grfdex(grfdex, fdexNameCaseInsensitive); *pid = DISPID_GLOBAL_COUNTER; @@ -819,6 +828,27 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_I2(pdp->rgvarg+2) == 1, "V_I2(psp->rgvargs+2) = %d\n", V_I2(pdp->rgvarg+2)); return S_OK; + case DISPID_GLOBAL_PROPARGPUT1: + CHECK_EXPECT(global_propargput1_i); + + ok(wFlags == DISPATCH_PROPERTYPUT, "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_I2, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 0, "V_I2(psp->rgvargs) = %d\n", V_I2(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) == 1, "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"); @@ -1294,6 +1324,18 @@ static void run_tests(void) CHECK_CALLED(global_propargput_d); CHECK_CALLED(global_propargput_i); + SET_EXPECT(global_propargput1_d); + SET_EXPECT(global_propargput1_i); + parse_script_a("propargput1 (counter()) = counter()"); + CHECK_CALLED(global_propargput1_d); + CHECK_CALLED(global_propargput1_i); + + SET_EXPECT(global_propargput1_d); + SET_EXPECT(global_propargput1_i); + parse_script_a("test.propargput1(counter()) = counter()"); + CHECK_CALLED(global_propargput1_d); + CHECK_CALLED(global_propargput1_i); + parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); parse_script_a("x = _ \n3");

1 0

Jacek Caban : vbscript: Skip the first (null) instruction in dump_code.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 4ca8447769449a2b36baa188d53ed68ba1159402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca8447769449a2b36baa188d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 17:05:16 2012 +0200 vbscript: Skip the first (null) instruction in dump_code. --- dlls/vbscript/compile.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 28d1280..a5a232e 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -98,7 +98,8 @@ static void dump_code(compile_ctx_t *ctx) { instr_t *instr; - for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { + for(instr = ctx->code->instrs+1; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { + assert(instr->op < OP_LAST); TRACE_(vbscript_disas)("%d:\t%s", (int)(instr-ctx->code->instrs), instr_info[instr->op].op_str); dump_instr_arg(instr_info[instr->op].arg1_type, &instr->arg1); dump_instr_arg(instr_info[instr->op].arg2_type, &instr->arg2);

1 0

Jacek Caban : vbscript: Added interpreter and compiler support for for each loops.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 44266442ed6db3ea4ccf563e4297d0353d6f4f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44266442ed6db3ea4ccf563e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 17:05:32 2012 +0200 vbscript: Added interpreter and compiler support for for each loops. --- dlls/vbscript/compile.c | 48 +++++++++++++++++++++++++- dlls/vbscript/interp.c | 84 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 2 + 3 files changed, 130 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index a5a232e..ab76bc7 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -290,6 +290,24 @@ static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR return S_OK; } +static HRESULT push_instr_uint_bstr(compile_ctx_t *ctx, vbsop_t op, unsigned arg1, const WCHAR *arg2) +{ + unsigned instr; + BSTR bstr; + + bstr = alloc_bstr_arg(ctx, arg2); + if(!bstr) + return E_OUTOFMEMORY; + + instr = push_instr(ctx, op); + if(!instr) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.uint = arg1; + instr_ptr(ctx, instr)->arg2.bstr = bstr; + return S_OK; +} + #define LABEL_FLAG 0x80000000 static unsigned alloc_label(compile_ctx_t *ctx) @@ -621,8 +639,34 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t *stat) { - FIXME("for each loop not implemented\n"); - return E_NOTIMPL; + unsigned loop_start, loop_end; + HRESULT hres; + + hres = compile_expression(ctx, stat->group_expr); + if(FAILED(hres)) + return hres; + + if(!push_instr(ctx, OP_newenum)) + return E_OUTOFMEMORY; + + loop_start = ctx->instr_cnt; + if(!(loop_end = alloc_label(ctx))) + return E_OUTOFMEMORY; + + hres = push_instr_uint_bstr(ctx, OP_enumnext, loop_end, stat->identifier); + if(FAILED(hres)) + return hres; + + hres = compile_statement(ctx, stat->body); + if(FAILED(hres)) + return hres; + + hres = push_instr_addr(ctx, OP_jmp, loop_start); + if(FAILED(hres)) + return hres; + + label_set_addr(ctx, loop_end); + return S_OK; } static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3f3e9c8..9a8f97e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -24,6 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static DISPID propput_dispid = DISPID_PROPERTYPUT; + typedef struct { vbscode_t *code; instr_t *instr; @@ -439,8 +441,6 @@ static inline void instr_jmp(exec_ctx_t *ctx, unsigned addr) static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, BOOL is_propput, DISPPARAMS *dp) { - static DISPID propput_dispid = DISPID_PROPERTYPUT; - dp->cNamedArgs = is_propput ? 1 : 0; dp->cArgs = arg_cnt + dp->cNamedArgs; dp->rgdispidNamedArgs = is_propput ? &propput_dispid : NULL; @@ -901,6 +901,86 @@ static HRESULT interp_step(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_newenum(exec_ctx_t *ctx) +{ + VARIANT *v, r; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + switch(V_VT(v)) { + case VT_DISPATCH: { + IEnumVARIANT *iter; + DISPPARAMS dp = {0}; + VARIANT iterv; + + hres = disp_call(ctx->script, V_DISPATCH(v), DISPID_NEWENUM, &dp, &iterv); + VariantClear(v); + if(FAILED(hres)) + return hres; + + if(V_VT(&iterv) != VT_UNKNOWN && V_VT(&iterv) != VT_DISPATCH) { + FIXME("Unsupported iterv %s\n", debugstr_variant(&iterv)); + VariantClear(&iterv); + return hres; + } + + hres = IUnknown_QueryInterface(V_UNKNOWN(&iterv), &IID_IEnumVARIANT, (void**)&iter); + IUnknown_Release(V_UNKNOWN(&iterv)); + if(FAILED(hres)) { + FIXME("Could not get IEnumVARIANT iface: %08x\n", hres); + return hres; + } + + V_VT(&r) = VT_UNKNOWN; + V_UNKNOWN(&r) = (IUnknown*)iter; + break; + } + default: + FIXME("Unsupported for %s\n", debugstr_variant(v)); + VariantClear(v); + return E_NOTIMPL; + } + + return stack_push(ctx, &r); +} + +static HRESULT interp_enumnext(exec_ctx_t *ctx) +{ + const unsigned loop_end = ctx->instr->arg1.uint; + const BSTR ident = ctx->instr->arg2.bstr; + VARIANT v; + DISPPARAMS dp = {&v, &propput_dispid, 1, 1}; + IEnumVARIANT *iter; + BOOL do_continue; + HRESULT hres; + + TRACE("\n"); + + assert(V_VT(stack_top(ctx, 0)) == VT_UNKNOWN); + iter = (IEnumVARIANT*)V_UNKNOWN(stack_top(ctx, 0)); + + V_VT(&v) = VT_EMPTY; + hres = IEnumVARIANT_Next(iter, 1, &v, NULL); + if(FAILED(hres)) + return hres; + + do_continue = hres == S_OK; + hres = assign_ident(ctx, ident, &dp); + VariantClear(&v); + if(FAILED(hres)) + return hres; + + if(do_continue) { + ctx->instr++; + }else { + stack_pop(ctx); + instr_jmp(ctx, loop_end); + } + return S_OK; +} + static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 432380d..a4ae64c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -194,6 +194,7 @@ typedef enum { X(div, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ + X(enumnext, 0, ARG_ADDR, ARG_BSTR) \ X(equal, 1, 0, 0) \ X(errmode, 1, ARG_INT, 0) \ X(eqv, 1, 0, 0) \ @@ -220,6 +221,7 @@ typedef enum { X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \ X(new, 1, ARG_STR, 0) \ + X(newenum, 1, 0, 0) \ X(not, 1, 0, 0) \ X(nothing, 1, 0, 0) \ X(null, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added for each loop tests.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 7cdd5354a207fa5195046986725c49e12bb7f623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdd5354a207fa51950469867… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 3 17:05:46 2012 +0200 vbscript: Added for each loop tests. --- dlls/vbscript/tests/lang.vbs | 10 ++ dlls/vbscript/tests/run.c | 214 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 222 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4900a52..1636de1 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -415,6 +415,16 @@ for x = 1 to 100 Call ok(false, "exit for not escaped the loop?") next +Call collectionObj.reset() +y = 0 +x = 10 +for each x in collectionObj + y = y+1 + Call ok(x = y, "x <> y") +next +Call ok(y = 3, "y = " & y) +Call ok(getVT(x) = "VT_EMPTY*", "getVT(x) = " & getVT(x)) + if false then Sub testsub x = true diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index e52e5ba..0e6d6ed 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -65,6 +65,8 @@ DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); +DEFINE_EXPECT(collectionobj_newenum_i); +DEFINE_EXPECT(Next); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -79,10 +81,13 @@ DEFINE_EXPECT(global_propargput1_i); #define DISPID_GLOBAL_COUNTER 1010 #define DISPID_GLOBAL_PROPARGPUT 1011 #define DISPID_GLOBAL_PROPARGPUT1 1012 +#define DISPID_GLOBAL_COLLOBJ 1013 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 +#define DISPID_COLLOBJ_RESET 3000 + static const WCHAR testW[] = {'t','e','s','t',0}; static BOOL strict_dispid_check; @@ -337,6 +342,96 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) ok_(__FILE__,line)(grfdex == expect, "grfdex = %x, expected %x\n", grfdex, expect); } +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + +static IDispatchEx enumDisp; + +static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumVARIANT)) { + *ppv = iface; + return S_OK; + } + + if(IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = &enumDisp; + return S_OK; + } + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + return 2; +} + +static ULONG WINAPI EnumVARIANT_Release(IEnumVARIANT *iface) +{ + return 1; +} + +static unsigned next_cnt; + +static HRESULT WINAPI EnumVARIANT_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + if(strict_dispid_check) + CHECK_EXPECT2(Next); + + ok(celt == 1, "celt = %d\n", celt); + ok(V_VT(rgVar) == VT_EMPTY, "V_VT(rgVar) = %d\n", V_VT(rgVar)); + ok(!pCeltFetched, "pCeltFetched = %p\n", pCeltFetched); + + if(next_cnt++ < 3) { + V_VT(rgVar) = VT_I2; + V_I2(rgVar) = next_cnt; + return S_OK; + } + + return S_FALSE; +} + +static HRESULT WINAPI EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl EnumVARIANTVtbl = { + EnumVARIANT_QueryInterface, + EnumVARIANT_AddRef, + EnumVARIANT_Release, + EnumVARIANT_Next, + EnumVARIANT_Skip, + EnumVARIANT_Reset, + EnumVARIANT_Clone +}; + +static IEnumVARIANT enumObj = { &EnumVARIANTVtbl }; + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -345,8 +440,10 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IDispatchEx)) *ppv = iface; - else + else { + trace("QI %s\n", debugstr_guid(riid)); return E_NOINTERFACE; + } IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -436,7 +533,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { - ok(0, "unexpected call\n"); + ok(0, "unexpected call %d\n", id); return E_NOTIMPL; } @@ -520,6 +617,91 @@ static IDispatchExVtbl testObjVtbl = { static IDispatchEx testObj = { &testObjVtbl }; +static HRESULT WINAPI enumDisp_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + return IEnumVARIANT_QueryInterface(&enumObj, riid, ppv); +} + +static IDispatchExVtbl enumDispVtbl = { + enumDisp_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx enumDisp = { &enumDispVtbl }; + +static HRESULT WINAPI collectionObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + if(!strcmp_wa(bstrName, "reset")) { + *pid = DISPID_COLLOBJ_RESET; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); + return DISP_E_UNKNOWNNAME; +} + +static HRESULT WINAPI collectionObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + switch(id) { + case DISPID_NEWENUM: + if(strict_dispid_check) + CHECK_EXPECT(collectionobj_newenum_i); + + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_UNKNOWN; + V_UNKNOWN(pvarRes) = (IUnknown*)&enumObj; + return S_OK; + case DISPID_COLLOBJ_RESET: + next_cnt = 0; + return S_OK; + } + + ok(0, "unexpected call %d\n", id); + return E_NOTIMPL; +} + +static IDispatchExVtbl collectionObjVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + collectionObj_GetDispID, + collectionObj_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx collectionObj = { &collectionObjVtbl }; + static ULONG refobj_ref; static ULONG WINAPI RefObj_AddRef(IDispatchEx *iface) @@ -585,6 +767,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTOBJ; return S_OK; } + if(!strcmp_wa(bstrName, "collectionObj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_COLLOBJ; + return S_OK; + } if(!strcmp_wa(bstrName, "vbvar")) { CHECK_EXPECT(global_vbvar_d); test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -753,6 +940,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + case DISPID_GLOBAL_COLLOBJ: + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&collectionObj; + return S_OK; + case DISPID_GLOBAL_REFOBJ: ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); @@ -1336,6 +1538,14 @@ static void run_tests(void) CHECK_CALLED(global_propargput1_d); CHECK_CALLED(global_propargput1_i); + next_cnt = 0; + SET_EXPECT(collectionobj_newenum_i); + SET_EXPECT(Next); + parse_script_a("for each x in collectionObj\nnext"); + CHECK_CALLED(collectionobj_newenum_i); + CHECK_CALLED(Next); + ok(next_cnt == 4, "next_cnt = %d\n", next_cnt); + parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); parse_script_a("x = _ \n3");

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixTransposePointerArray().
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 929c669b4ff61eb3fabd0941d0eb33ee881a0224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929c669b4ff61eb3fabd0941d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:27:57 2012 +0200 d3dx9: Implement ID3DXBaseEffect::SetMatrixTransposePointerArray(). --- dlls/d3dx9_36/effect.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 08ae633..877df29 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2592,10 +2592,38 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposeArray(ID3DXBaseEffec static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(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); + D3DXMATRIX m; - 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 && count <= param->element_count) + { + UINT i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + set_matrix(get_parameter_struct(param->member_handles[i]), D3DXMatrixTranspose(&m, matrix[i])); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + 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_GetMatrixTransposePointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count)

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixPointerArray() test.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 1ae494a9bb52cae2bf67cb6d3bb3192b041aa7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae494a9bb52cae2bf67cb6d3… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:28:01 2012 +0200 d3dx9/tests: Add effect parameter value SetMatrixPointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 69 ++++++++++++++++++++++++++++++++--------- 1 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c4046c7..46406a4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -885,6 +885,7 @@ test_effect_parameter_value_data[] = #undef ADD_PARAMETER_VALUE +/* Multiple of 16 to cover complete matrices */ #define EFFECT_PARAMETER_VALUE_ARRAY_SIZE 48 /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f @@ -1640,7 +1641,8 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) FLOAT fvalue; DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - UINT l, element; + UINT l, n, m, element; + const D3DXMATRIX *matrix_pointer_array[sizeof(input_value)/sizeof(D3DXMATRIX)]; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name); @@ -1693,6 +1695,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) * effect->lpVtbl->SetMatrix(effect, parameter, NULL); * effect->lpVtbl->GetMatrix(effect, parameter, NULL); * effect->lpVtbl->SetMatrixArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + * effect->lpVtbl->SetMatrixPointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->SetMatrixTranspose(effect, parameter, NULL); * effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->GetValue(effect, parameter, NULL, res_desc->Bytes); @@ -1814,6 +1817,14 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixPointerArray(effect, NULL, matrix_pointer_array, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->SetMatrixPointerArray(effect, NULL, matrix_pointer_array, 0); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixTranspose(effect, NULL, (D3DXMATRIX *)input_value); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); @@ -2054,8 +2065,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetVectorArray(effect, parameter, (D3DXVECTOR4 *)input_value, element); if (res_desc->Elements && res_desc->Class == D3DXPC_VECTOR && element <= res_desc->Elements) { - UINT m; - for (m = 0; m < element; ++m) { for (l = 0; l < res_desc->Columns; ++l) @@ -2087,8 +2096,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2120,14 +2127,10 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetMatrixArray(effect, parameter, (D3DXMATRIX *)input_value, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) { - UINT n; - for (n = 0; n < element; ++n) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2148,6 +2151,48 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + /* SetMatrixPointerArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + } + hr = effect->lpVtbl->SetMatrixPointerArray(effect, parameter, matrix_pointer_array, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element) + { + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l + m * 4 + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } + /* SetMatrixTranspose */ fvalue = 1.33; for (l = 0; l < 16; ++l) @@ -2161,8 +2206,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2194,14 +2237,10 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, (D3DXMATRIX *)input_value, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) { - UINT n; - for (n = 0; n < element; ++n) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns)

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTransposePointerArray() test.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 18126eeb4f7c9233108ef0126bbebcb7f9fb36bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18126eeb4f7c9233108ef0126… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:28:07 2012 +0200 d3dx9/tests: Add effect parameter value SetMatrixTransposePointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 46406a4..7627649 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1698,6 +1698,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) * effect->lpVtbl->SetMatrixPointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->SetMatrixTranspose(effect, parameter, NULL); * effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + * effect->lpVtbl->SetMatrixTransposePointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->GetValue(effect, parameter, NULL, res_desc->Bytes); * effect->lpVtbl->SetValue(effect, parameter, NULL, res_desc->Bytes); */ @@ -1849,6 +1850,14 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, NULL, matrix_pointer_array, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, NULL, matrix_pointer_array, 0); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetValue(effect, NULL, input_value, res_desc->Bytes); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetValue failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); @@ -2260,6 +2269,48 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + + /* SetMatrixTransposePointerArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + } + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element) + { + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l * 4 + m + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);

1 0

Henri Verbeet : d3d9: Introduce a helper function to create a wined3d_swapchain_desc from D3DPRESENT_PARAMETERS .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 003ab4d3e071b949ae2fec18c427c439751d8a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003ab4d3e071b949ae2fec18c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:39 2012 +0200 d3d9: Introduce a helper function to create a wined3d_swapchain_desc from D3DPRESENT_PARAMETERS. --- dlls/d3d9/device.c | 84 +++++++++++++++------------------------------------ 1 files changed, 25 insertions(+), 59 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 47a216c..df8deb2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -181,6 +181,27 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, + const D3DPRESENT_PARAMETERS *present_parameters) +{ + swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; + swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; + swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); + swapchain_desc->backbuffer_count = max(1, present_parameters->BackBufferCount); + swapchain_desc->multisample_type = present_parameters->MultiSampleType; + swapchain_desc->multisample_quality = present_parameters->MultiSampleQuality; + swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->device_window = present_parameters->hDeviceWindow; + swapchain_desc->windowed = present_parameters->Windowed; + swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; + swapchain_desc->auto_depth_stencil_format + = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); + swapchain_desc->flags = present_parameters->Flags; + swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; + swapchain_desc->swap_interval = present_parameters->PresentationInterval; + swapchain_desc->auto_restore_display_mode = TRUE; +} + static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9Ex *iface) { return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9Ex_iface); @@ -453,22 +474,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); - desc.backbuffer_width = present_parameters->BackBufferWidth; - desc.backbuffer_height = present_parameters->BackBufferHeight; - desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); - desc.backbuffer_count = max(1, present_parameters->BackBufferCount); - desc.multisample_type = present_parameters->MultiSampleType; - desc.multisample_quality = present_parameters->MultiSampleQuality; - desc.swap_effect = present_parameters->SwapEffect; - desc.device_window = present_parameters->hDeviceWindow; - desc.windowed = present_parameters->Windowed; - desc.enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; - desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); - desc.flags = present_parameters->Flags; - desc.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - desc.swap_interval = present_parameters->PresentationInterval; - desc.auto_restore_display_mode = TRUE; - + wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain9_iface; @@ -569,38 +575,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); - /* Reset states that hold a COM object. WineD3D holds an internal reference to set objects, because - * such objects can still be used for rendering after their external d3d9 object has been destroyed. - * These objects must not be enumerated. Unsetting them tells WineD3D that the application will not - * make use of the hidden reference and destroys the objects. - * - * Unsetting them is no problem, because the states are supposed to be reset anyway. If the validation - * below fails, the device is considered "lost", and _Reset and _Release are the only allowed calls - */ - wined3d_mutex_lock(); - - swapchain_desc.backbuffer_width = present_parameters->BackBufferWidth; - swapchain_desc.backbuffer_height = present_parameters->BackBufferHeight; - swapchain_desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); - swapchain_desc.backbuffer_count = max(1, present_parameters->BackBufferCount); - swapchain_desc.multisample_type = present_parameters->MultiSampleType; - swapchain_desc.multisample_quality = present_parameters->MultiSampleQuality; - swapchain_desc.swap_effect = present_parameters->SwapEffect; - swapchain_desc.device_window = present_parameters->hDeviceWindow; - swapchain_desc.windowed = present_parameters->Windowed; - swapchain_desc.enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; - swapchain_desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); - swapchain_desc.flags = present_parameters->Flags; - swapchain_desc.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - swapchain_desc.swap_interval = present_parameters->PresentationInterval; - swapchain_desc.auto_restore_display_mode = TRUE; - + wined3d_mutex_lock(); + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, reset_enum_callback); if (FAILED(hr)) device->not_reset = TRUE; else device->not_reset = FALSE; - wined3d_mutex_unlock(); return hr; @@ -3426,22 +3407,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine for (i = 0; i < count; ++i) { - swapchain_desc[i].backbuffer_width = parameters[i].BackBufferWidth; - swapchain_desc[i].backbuffer_height = parameters[i].BackBufferHeight; - swapchain_desc[i].backbuffer_format = wined3dformat_from_d3dformat(parameters[i].BackBufferFormat); - swapchain_desc[i].backbuffer_count = max(1, parameters[i].BackBufferCount); - swapchain_desc[i].multisample_type = parameters[i].MultiSampleType; - swapchain_desc[i].multisample_quality = parameters[i].MultiSampleQuality; - swapchain_desc[i].swap_effect = parameters[i].SwapEffect; - swapchain_desc[i].device_window = parameters[i].hDeviceWindow; - swapchain_desc[i].windowed = parameters[i].Windowed; - swapchain_desc[i].enable_auto_depth_stencil = parameters[i].EnableAutoDepthStencil; - swapchain_desc[i].auto_depth_stencil_format = - wined3dformat_from_d3dformat(parameters[i].AutoDepthStencilFormat); - swapchain_desc[i].flags = parameters[i].Flags; - swapchain_desc[i].refresh_rate = parameters[i].FullScreen_RefreshRateInHz; - swapchain_desc[i].swap_interval = parameters[i].PresentationInterval; - swapchain_desc[i].auto_restore_display_mode = TRUE; + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc[i], &parameters[i]); } hr = wined3d_device_init_3d(device->wined3d_device, swapchain_desc);

1 0

Henri Verbeet : d3d9: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: c98725ccc30973eeb4089eea711879d54317b1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98725ccc30973eeb4089eea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:40 2012 +0200 d3d9: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc. --- dlls/d3d9/d3d9_private.h | 9 +------ dlls/d3d9/device.c | 52 +++++++++++++++++++-------------------------- dlls/d3d9/swapchain.c | 16 +------------- 3 files changed, 25 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6a080d1..bed2ed0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -39,17 +39,12 @@ #include "d3d9.h" #include "wine/wined3d.h" -/* =========================================================================== - Internal use - =========================================================================== */ extern HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *swapchain_desc) DECLSPEC_HIDDEN; -/* =========================================================================== - Macros - =========================================================================== */ -/* Not nice, but it lets wined3d support different versions of directx */ #define WINECAPSTOD3D9CAPS(_pD3D9Caps, _pWineCaps) \ _pD3D9Caps->DeviceType = (D3DDEVTYPE) _pWineCaps->DeviceType; \ _pD3D9Caps->AdapterOrdinal = _pWineCaps->AdapterOrdinal; \ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index df8deb2..67a2aad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -181,6 +181,26 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *swapchain_desc) +{ + present_parameters->BackBufferWidth = swapchain_desc->backbuffer_width; + present_parameters->BackBufferHeight = swapchain_desc->backbuffer_height; + present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); + present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; + present_parameters->MultiSampleType = swapchain_desc->multisample_type; + present_parameters->MultiSampleQuality = swapchain_desc->multisample_quality; + present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->hDeviceWindow = swapchain_desc->device_window; + present_parameters->Windowed = swapchain_desc->windowed; + present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; + present_parameters->AutoDepthStencilFormat + = d3dformat_from_wined3dformat(swapchain_desc->auto_depth_stencil_format); + present_parameters->Flags = swapchain_desc->flags; + present_parameters->FullScreen_RefreshRateInHz = swapchain_desc->refresh_rate; + present_parameters->PresentationInterval = swapchain_desc->swap_interval; +} + static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -477,21 +497,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain9_iface; - - present_parameters->BackBufferWidth = desc.backbuffer_width; - present_parameters->BackBufferHeight = desc.backbuffer_height; - present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - present_parameters->BackBufferCount = desc.backbuffer_count; - present_parameters->MultiSampleType = desc.multisample_type; - present_parameters->MultiSampleQuality = desc.multisample_quality; - present_parameters->SwapEffect = desc.swap_effect; - present_parameters->hDeviceWindow = desc.device_window; - present_parameters->Windowed = desc.windowed; - present_parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - present_parameters->Flags = desc.flags; - present_parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - present_parameters->PresentationInterval = desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); return hr; } @@ -3425,21 +3431,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine for (i = 0; i < count; ++i) { - parameters[i].BackBufferWidth = swapchain_desc[i].backbuffer_width; - parameters[i].BackBufferHeight = swapchain_desc[i].backbuffer_height; - parameters[i].BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc[i].backbuffer_format); - parameters[i].BackBufferCount = swapchain_desc[i].backbuffer_count; - parameters[i].MultiSampleType = swapchain_desc[i].multisample_type; - parameters[i].MultiSampleQuality = swapchain_desc[i].multisample_quality; - parameters[i].SwapEffect = swapchain_desc[i].swap_effect; - parameters[i].hDeviceWindow = swapchain_desc[i].device_window; - parameters[i].Windowed = swapchain_desc[i].windowed; - parameters[i].EnableAutoDepthStencil = swapchain_desc[i].enable_auto_depth_stencil; - parameters[i].AutoDepthStencilFormat = - d3dformat_from_wined3dformat(swapchain_desc[i].auto_depth_stencil_format); - parameters[i].Flags = swapchain_desc[i].flags; - parameters[i].FullScreen_RefreshRateInHz = swapchain_desc[i].refresh_rate; - parameters[i].PresentationInterval = swapchain_desc[i].swap_interval; + present_parameters_from_wined3d_swapchain_desc(&parameters[i], &swapchain_desc[i]); } HeapFree(GetProcessHeap(), 0, swapchain_desc); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index dace375..af56d73 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -215,21 +215,7 @@ static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *i wined3d_mutex_lock(); hr = wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &desc); wined3d_mutex_unlock(); - - parameters->BackBufferWidth = desc.backbuffer_width; - parameters->BackBufferHeight = desc.backbuffer_height; - parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - parameters->BackBufferCount = desc.backbuffer_count; - parameters->MultiSampleType = desc.multisample_type; - parameters->MultiSampleQuality = desc.multisample_quality; - parameters->SwapEffect = desc.swap_effect; - parameters->hDeviceWindow = desc.device_window; - parameters->Windowed = desc.windowed; - parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - parameters->Flags = desc.flags; - parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - parameters->PresentationInterval = desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(parameters, &desc); return hr; }

1 0