August 2009 - Wine-commits - list.winehq.org

Hongbo Ni : user32: Fix DLL injection problem using LOAD_WITH_ALTERED_SEARCH_PATH.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 650a0f3fdd8c2b0dfbefd035fa8d8c8691c8c026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=650a0f3fdd8c2b0dfbefd035f… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Thu Aug 27 11:18:14 2009 +1000 user32: Fix DLL injection problem using LOAD_WITH_ALTERED_SEARCH_PATH. --- dlls/user32/hook.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index b6dc8e8..ae4c5f1 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -322,7 +322,7 @@ void *get_hook_proc( void *proc, const WCHAR *module ) { TRACE( "loading %s\n", debugstr_w(module) ); /* FIXME: the library will never be freed */ - if (!(mod = LoadLibraryW(module))) return NULL; + if (!(mod = LoadLibraryExW(module, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) return NULL; } return (char *)mod + (ULONG_PTR)proc; }

1 0

Jacek Caban : jscript: Create undeclared values to script_disp instead of var_disp.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 4b8adbef866eea18e231dab64156c858c66082f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8adbef866eea18e231dab64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 01:22:17 2009 +0200 jscript: Create undeclared values to script_disp instead of var_disp. --- dlls/jscript/engine.c | 4 ++-- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 96117f2..c9db8e6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -537,11 +537,11 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, js return S_OK; if(flags & EXPR_NEWREF) { - hres = jsdisp_get_id(ctx->var_disp, identifier, fdexNameEnsure, &id); + hres = jsdisp_get_id(ctx->parser->script->script_disp, identifier, fdexNameEnsure, &id); if(FAILED(hres)) return hres; - exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->var_disp), id); + exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->parser->script->script_disp), id); return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 56f71d6..b0e90fc 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -907,4 +907,7 @@ function () {} nosemicolon(); ok(typeof(doesnotexist) === "undefined", "typeof(doesnotexist) = " + typeof(doesnotexist)); +(function() { newValue = 1; })(); +ok(newValue === 1, "newValue = " + newValue); + reportSuccess();

1 0

Jacek Caban : jscript: Return "undefined" type for invalid references.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 9c18f6ef5d84bc2470c5f90988832a1ec5f69282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c18f6ef5d84bc2470c5f9098… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 01:21:56 2009 +0200 jscript: Return "undefined" type for invalid references. --- dlls/jscript/engine.c | 59 ++++++++++++++++++++++++++++--------------- dlls/jscript/tests/lang.js | 2 + 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d314de6..96117f2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2228,11 +2228,8 @@ HRESULT void_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, } /* ECMA-262 3rd Edition 11.4.3 */ -HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT typeof_exprval(exec_ctx_t *ctx, exprval_t *exprval, jsexcept_t *ei, const WCHAR **ret) { - unary_expression_t *expr = (unary_expression_t*)_expr; - const WCHAR *str; - exprval_t exprval; VARIANT val; HRESULT hres; @@ -2243,57 +2240,77 @@ HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags static const WCHAR stringW[] = {'s','t','r','i','n','g',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); - if(FAILED(hres)) - return hres; + if(exprval->type == EXPRVAL_INVALID) { + *ret = undefinedW; + return S_OK; + } - hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); - exprval_release(&exprval); + hres = exprval_to_value(ctx->parser->script, exprval, ei, &val); if(FAILED(hres)) return hres; switch(V_VT(&val)) { case VT_EMPTY: - str = undefinedW; + *ret = undefinedW; break; case VT_NULL: - str = objectW; + *ret = objectW; break; case VT_BOOL: - str = booleanW; + *ret = booleanW; break; case VT_I4: case VT_R8: - str = numberW; + *ret = numberW; break; case VT_BSTR: - str = stringW; + *ret = stringW; break; case VT_DISPATCH: { DispatchEx *dispex; dispex = iface_to_jsdisp((IUnknown*)V_DISPATCH(&val)); if(dispex) { - str = dispex->builtin_info->class == JSCLASS_FUNCTION ? functionW : objectW; - IDispatchEx_Release(_IDispatchEx_(dispex)); + *ret = is_class(dispex, JSCLASS_FUNCTION) ? functionW : objectW; + jsdisp_release(dispex); }else { - str = objectW; + *ret = objectW; } break; } default: FIXME("unhandled vt %d\n", V_VT(&val)); - VariantClear(&val); - return E_NOTIMPL; + hres = E_NOTIMPL; } VariantClear(&val); + return S_OK; +} + +HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + unary_expression_t *expr = (unary_expression_t*)_expr; + const WCHAR *str = NULL; + exprval_t exprval; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = typeof_exprval(ctx, &exprval, ei, &str); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; ret->type = EXPRVAL_VARIANT; V_VT(&ret->u.var) = VT_BSTR; V_BSTR(&ret->u.var) = SysAllocString(str); + if(!V_BSTR(&ret->u.var)) + return E_OUTOFMEMORY; + return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 8ab4d1e..56f71d6 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -905,4 +905,6 @@ function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon(); +ok(typeof(doesnotexist) === "undefined", "typeof(doesnotexist) = " + typeof(doesnotexist)); + reportSuccess();

1 0

Jacek Caban : jscript: Throw an exception when evaluating invalid identifier instead of on lookup failure .
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: a4acd1b38faabd4690cb9155dd93214caba6f379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4acd1b38faabd4690cb9155d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 01:21:38 2009 +0200 jscript: Throw an exception when evaluating invalid identifier instead of on lookup failure. --- dlls/jscript/engine.c | 20 ++++++++++++++++---- dlls/jscript/engine.h | 4 +++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2f884b2..d314de6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -57,6 +57,9 @@ static void exprval_release(exprval_t *val) if(val->u.nameref.disp) IDispatch_Release(val->u.nameref.disp); SysFreeString(val->u.nameref.name); + return; + case EXPRVAL_INVALID: + SysFreeString(val->u.identifier); } } @@ -75,10 +78,14 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, } return disp_propget(val->u.idref.disp, val->u.idref.id, ctx->lcid, ret, ei, NULL/*FIXME*/); - default: - ERR("type %d\n", val->type); - return E_FAIL; + case EXPRVAL_NAMEREF: + break; + case EXPRVAL_INVALID: + return throw_type_error(ctx, ei, IDS_UNDEFINED, val->u.identifier); } + + ERR("type %d\n", val->type); + return E_FAIL; } static HRESULT exprval_to_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, VARIANT *ret) @@ -538,7 +545,12 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, js return S_OK; } - return throw_type_error(ctx->var_disp->ctx, ei, IDS_UNDEFINED, identifier); + ret->type = EXPRVAL_INVALID; + ret->u.identifier = SysAllocString(identifier); + if(!ret->u.identifier) + return E_OUTOFMEMORY; + + return S_OK; } /* ECMA-262 3rd Edition 12.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8d53f00..09394ce 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -272,7 +272,8 @@ typedef struct { enum { EXPRVAL_VARIANT, EXPRVAL_IDREF, - EXPRVAL_NAMEREF + EXPRVAL_NAMEREF, + EXPRVAL_INVALID } type; union { VARIANT var; @@ -284,6 +285,7 @@ typedef struct { IDispatch *disp; BSTR name; } nameref; + BSTR identifier; } u; } exprval_t;

1 0

Jacek Caban : jscript: Don't require semicolon after function declaration.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 2c255287cd9507f4d4018da6918f8dcbc5e92a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c255287cd9507f4d4018da69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 01:21:03 2009 +0200 jscript: Don't require semicolon after function declaration. --- dlls/jscript/parser.y | 2 ++ dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7e74880..748a06a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -264,6 +264,8 @@ HtmlComment /* ECMA-262 3rd Edition 14 */ SourceElements : /* empty */ { $$ = new_source_elements(ctx); } + | SourceElements FunctionExpression + { $$ = $1; } | SourceElements Statement { $$ = source_elements_add_statement($1, $2); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index fd14c93..8ab4d1e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -902,5 +902,7 @@ ok(re.source === "=(\\?|%3F)", "re.source = " + re.source); ok(createNullBSTR() === '', "createNullBSTR() !== ''"); function do_test() {} +function nosemicolon() {} nosemicolon(); +function () {} nosemicolon(); reportSuccess();

1 0

Jacek Caban : jscript: Fixed parsing regexps starting with '='.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 05b104c6a3d0193302b8e2cd0c00d54090dade5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b104c6a3d0193302b8e2cd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 01:20:37 2009 +0200 jscript: Fixed parsing regexps starting with '='. --- dlls/jscript/lex.c | 7 +++++-- dlls/jscript/parser.y | 13 ++++++++++--- dlls/jscript/tests/lang.js | 3 +++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 1b33737..680ce55 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -735,7 +735,7 @@ int parser_lex(void *lval, parser_ctx_t *ctx) if(*ctx->ptr == '=') { /* /= */ ctx->ptr++; *(int*)lval = EXPR_ASSIGNDIV; - return tAssignOper; + return kDIVEQ; } } return '/'; @@ -772,7 +772,10 @@ literal_t *parse_regexp(parser_ctx_t *ctx) TRACE("\n"); - re = ctx->ptr; + while(*ctx->ptr != '/') + ctx->ptr--; + + re = ++ctx->ptr; while(ctx->ptr < ctx->end && *ctx->ptr != '/') { if(*ctx->ptr++ == '\\' && ctx->ptr < ctx->end) ctx->ptr++; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 29d805f..7e74880 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -172,7 +172,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state /* keywords */ %token kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kIF kFINALLY kFOR kIN %token kINSTANCEOF kNEW kNULL kUNDEFINED kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH -%token tANDAND tOROR tINC tDEC tHTMLCOMMENT +%token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ %token <srcptr> kFUNCTION '}' @@ -245,6 +245,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <literal> PropertyName %type <literal> BooleanLiteral %type <srcptr> KFunction +%type <ival> AssignOper %nonassoc LOWER_THAN_ELSE %nonassoc kELSE @@ -515,12 +516,16 @@ ExpressionNoIn | ExpressionNoIn ',' AssignmentExpressionNoIn { $$ = new_binary_expression(ctx, EXPR_COMMA, $1, $3); } +AssignOper + : tAssignOper { $$ = $1; } + | kDIVEQ { $$ = EXPR_ASSIGNDIV; } + /* ECMA-262 3rd Edition 11.13 */ AssignmentExpression : ConditionalExpression { $$ = $1; } | LeftHandSideExpression '=' AssignmentExpression { $$ = new_binary_expression(ctx, EXPR_ASSIGN, $1, $3); } - | LeftHandSideExpression tAssignOper AssignmentExpression + | LeftHandSideExpression AssignOper AssignmentExpression { $$ = new_binary_expression(ctx, $2, $1, $3); } /* ECMA-262 3rd Edition 11.13 */ @@ -529,7 +534,7 @@ AssignmentExpressionNoIn { $$ = $1; } | LeftHandSideExpression '=' AssignmentExpressionNoIn { $$ = new_binary_expression(ctx, EXPR_ASSIGN, $1, $3); } - | LeftHandSideExpression tAssignOper AssignmentExpressionNoIn + | LeftHandSideExpression AssignOper AssignmentExpressionNoIn { $$ = new_binary_expression(ctx, $2, $1, $3); } /* ECMA-262 3rd Edition 11.12 */ @@ -800,6 +805,8 @@ Literal | tStringLiteral { $$ = new_string_literal(ctx, $1); } | '/' { $$ = parse_regexp(ctx); if(!$$) YYABORT; } + | kDIVEQ { $$ = parse_regexp(ctx); + if(!$$) YYABORT; } /* ECMA-262 3rd Edition 7.8.2 */ BooleanLiteral diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index fa100ea..fd14c93 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -896,6 +896,9 @@ ok(""+str === "test", "''+str = " + str); ok((function (){return 1;})() === 1, "(function (){return 1;})() = " + (function (){return 1;})()); +var re = /=(\?|%3F)/g; +ok(re.source === "=(\\?|%3F)", "re.source = " + re.source); + ok(createNullBSTR() === '', "createNullBSTR() !== ''"); function do_test() {}

1 0

Henri Verbeet : wined3d: Remove trailing spaces.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 560d63548d4e9bc6c01ed2c6569e2c1129b26ee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=560d63548d4e9bc6c01ed2c65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 27 10:04:56 2009 +0200 wined3d: Remove trailing spaces. --- dlls/wined3d/arb_program_shader.c | 9 +++--- dlls/wined3d/device.c | 5 ++- dlls/wined3d/directx.c | 15 +++++------ dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 50 +++++++++++++++++------------------- dlls/wined3d/stateblock.c | 15 ++++------ dlls/wined3d/surface.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 32 +++++++++++------------ 10 files changed, 63 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=560d63548d4e9bc6c01ed…

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectVectorVariable interface.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 3f7cb7438828b23e33c257a860c2e524aa99f196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7cb7438828b23e33c257a86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 27 10:04:55 2009 +0200 d3d10: Add the ID3D10EffectVectorVariable interface. --- include/d3d10effect.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 7edc4ba..a97b5e9 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -250,6 +250,53 @@ DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectVectorVariable, 0x62b98c44, 0x1f82, 0x4c67, 0xbc, 0xd0, 0x72, 0xcf, 0x8f, 0x21, 0x7e, 0x81); + +#define INTERFACE ID3D10EffectVectorVariable +DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectVectorVariable methods */ + STDMETHOD(SetBoolVector)(THIS_ BOOL *value) PURE; + STDMETHOD(SetIntVector)(THIS_ int *value) PURE; + STDMETHOD(SetFloatVector)(THIS_ float *value) PURE; + STDMETHOD(GetBoolVector)(THIS_ BOOL *value) PURE; + STDMETHOD(GetIntVector)(THIS_ int *value) PURE; + STDMETHOD(GetFloatVector)(THIS_ float *value) PURE; + STDMETHOD(SetBoolVectorArray)(THIS_ BOOL *values, UINT offset, UINT count) PURE; + STDMETHOD(SetIntVectorArray)(THIS_ int *values, UINT offset, UINT count) PURE; + STDMETHOD(SetFloatVectorArray)(THIS_ float *values, UINT offset, UINT count) PURE; + STDMETHOD(GetBoolVectorArray)(THIS_ BOOL *values, UINT offset, UINT count) PURE; + STDMETHOD(GetIntVectorArray)(THIS_ int *values, UINT offset, UINT count) PURE; + STDMETHOD(GetFloatVectorArray)(THIS_ float *values, UINT offset, UINT count) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectMatrixVariable, 0x50666c24, 0xb82f, 0x4eed, 0xa1, 0x72, 0x5b, 0x6e, 0x7e, 0x85, 0x22, 0xe0); #define INTERFACE ID3D10EffectMatrixVariable

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectScalarVariable interface.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 9550b756e011355f47b60f35fcafbbfcb8bb9377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9550b756e011355f47b60f35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 27 10:04:54 2009 +0200 d3d10: Add the ID3D10EffectScalarVariable interface. --- include/d3d10effect.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index b9c5c08..7edc4ba 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -203,6 +203,53 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectScalarVariable, 0x00e48f7b, 0xd2c8, 0x49e8, 0xa8, 0x6c, 0x02, 0x2d, 0xee, 0x53, 0x43, 0x1f); + +#define INTERFACE ID3D10EffectScalarVariable +DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectScalarVariable methods */ + STDMETHOD(SetFloat)(THIS_ float value) PURE; + STDMETHOD(GetFloat)(THIS_ float *value) PURE; + STDMETHOD(SetFloatArray)(THIS_ float *values, UINT offset, UINT count) PURE; + STDMETHOD(GetFloatArray)(THIS_ float *values, UINT offset, UINT count) PURE; + STDMETHOD(SetInt)(THIS_ int value) PURE; + STDMETHOD(GetInt)(THIS_ int *value) PURE; + STDMETHOD(SetIntArray)(THIS_ int *values, UINT offset, UINT count) PURE; + STDMETHOD(GetIntArray)(THIS_ int *values, UINT offset, UINT count) PURE; + STDMETHOD(SetBool)(THIS_ BOOL value) PURE; + STDMETHOD(GetBool)(THIS_ BOOL *value) PURE; + STDMETHOD(SetBoolArray)(THIS_ BOOL *values, UINT offset, UINT count) PURE; + STDMETHOD(GetBoolArray)(THIS_ BOOL *values, UINT offset, UINT count) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectMatrixVariable, 0x50666c24, 0xb82f, 0x4eed, 0xa1, 0x72, 0x5b, 0x6e, 0x7e, 0x85, 0x22, 0xe0); #define INTERFACE ID3D10EffectMatrixVariable

1 0

Henri Verbeet : wined3d: Get rid of a redundant memset() in device_stream_info_from_declaration().
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: afc06ce7485902064827bbc5c6c5656708f38dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc06ce7485902064827bbc5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 27 10:04:53 2009 +0200 wined3d: Get rid of a redundant memset() in device_stream_info_from_declaration(). --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 00a4c96..edfe627 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -182,7 +182,8 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, const DWORD *streams = declaration->streams; unsigned int i; - memset(stream_info, 0, sizeof(*stream_info)); + stream_info->use_map = 0; + stream_info->swizzle_map = 0; /* Check for transformed vertices, disable vertex shader if present. */ stream_info->position_transformed = declaration->position_transformed;

1 0