September 2009 - Wine-commits

Jacek Caban : jscript: Added 'in' expression implementation.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 1e7b90463eaf226704d8fa76dbed7e27d9bd0b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7b90463eaf226704d8fa76d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 19:10:06 2009 +0200 jscript: Added 'in' expression implementation. --- dlls/jscript/engine.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 11 +++++++++++ dlls/jscript/tests/run.c | 30 +++++++++++++++++++++++++++--- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 593294c..1ff5eb3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2028,10 +2028,44 @@ HRESULT instanceof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f } /* ECMA-262 3rd Edition 11.8.7 */ -HRESULT in_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT in_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *obj, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT_BOOL ret; + DISPID id; + BSTR str; + HRESULT hres; + + if(V_VT(obj) != VT_DISPATCH) { + FIXME("throw TypeError"); + return E_FAIL; + } + + hres = to_string(ctx->parser->script, lval, ei, &str); + if(FAILED(hres)) + return hres; + + hres = disp_get_id(V_DISPATCH(obj), str, 0, &id); + SysFreeString(str); + if(SUCCEEDED(hres)) + ret = VARIANT_TRUE; + else if(hres == DISP_E_UNKNOWNNAME) + ret = VARIANT_FALSE; + else + return hres; + + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = ret; + return S_OK; +} + +/* ECMA-262 3rd Edition 11.8.7 */ +HRESULT in_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, in_eval, ei, ret); } /* ECMA-262 3rd Edition 11.6.1 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 354fdb4..ae69e71 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -817,6 +817,17 @@ ok(("" instanceof Object) === false, "'' is instance of Object"); ok(arguments.toString() === "[object Object]", "arguments.toString() = " + arguments.toString()); })(1,2); +obj = new String(); +ok(("length" in obj) === true, "length is not in obj"); +ok(("isPrototypeOf" in obj) === true, "isPrototypeOf is not in obj"); +ok(("abc" in obj) === false, "test is in obj"); +obj.abc = 1; +ok(("abc" in obj) === true, "test is not in obj"); +ok(("1" in obj) === false, "1 is in obj"); + +obj = [1,2,3]; +ok((1 in obj) === true, "1 is not in obj"); + ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); ok(isNaN(Infinity) === false, "isNaN(Infinity) !== false"); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 90b022d..786624c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -66,6 +66,8 @@ DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(testobj_delete); DEFINE_EXPECT(testobj_value); +DEFINE_EXPECT(testobj_prop_d); +DEFINE_EXPECT(testobj_noprop_d); DEFINE_EXPECT(GetItemInfo_testVal); #define DISPID_GLOBAL_TESTPROPGET 0x1000 @@ -78,6 +80,8 @@ DEFINE_EXPECT(GetItemInfo_testVal); #define DISPID_GLOBAL_NULL_BSTR 0x1007 #define DISPID_GLOBAL_NULL_DISP 0x1008 +#define DISPID_TESTOBJ_PROP 0x2000 + static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; @@ -194,9 +198,21 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown return E_NOTIMPL; } -static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - ok(0, "unexpected call\n"); + if(!strcmp_wa(bstrName, "prop")) { + CHECK_EXPECT(testobj_prop_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + *pid = DISPID_TESTOBJ_PROP; + return S_OK; + } + if(!strcmp_wa(bstrName, "noprop")) { + CHECK_EXPECT(testobj_noprop_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + return DISP_E_UNKNOWNNAME; + } + + ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return E_NOTIMPL; } @@ -243,7 +259,7 @@ static IDispatchExVtbl testObjVtbl = { DispatchEx_GetTypeInfo, DispatchEx_GetIDsOfNames, DispatchEx_Invoke, - DispatchEx_GetDispID, + testObj_GetDispID, testObj_InvokeEx, testObj_DeleteMemberByName, DispatchEx_DeleteMemberByDispID, @@ -884,6 +900,14 @@ static void run_tests(void) parse_script_a("ok((testObj instanceof Object) === false, 'testObj is instance of Object');"); + SET_EXPECT(testobj_prop_d); + parse_script_a("ok(('prop' in testObj) === true, 'prop is not in testObj');"); + CHECK_CALLED(testobj_prop_d); + + SET_EXPECT(testobj_noprop_d); + parse_script_a("ok(('noprop' in testObj) === false, 'noprop is in testObj');"); + CHECK_CALLED(testobj_noprop_d); + SET_EXPECT(testobj_value); parse_script_a("ok(String(testObj) === '1', 'wrong testObj value');"); CHECK_CALLED(testobj_value);

1 0

Jacek Caban : jscript: Fixed typeof implementation for null VT_DISPATCH.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: dda957d87cf27acfd6819e2c486f383d14968663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda957d87cf27acfd6819e2c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 6 19:09:30 2009 +0200 jscript: Fixed typeof implementation for null VT_DISPATCH. --- dlls/jscript/engine.c | 3 +-- dlls/jscript/tests/lang.js | 3 +++ dlls/jscript/tests/run.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3931fff..593294c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2336,8 +2336,7 @@ static HRESULT typeof_exprval(exec_ctx_t *ctx, exprval_t *exprval, jsexcept_t *e case VT_DISPATCH: { DispatchEx *dispex; - dispex = iface_to_jsdisp((IUnknown*)V_DISPATCH(&val)); - if(dispex) { + if(V_DISPATCH(&val) && (dispex = iface_to_jsdisp((IUnknown*)V_DISPATCH(&val)))) { *ret = is_class(dispex, JSCLASS_FUNCTION) ? functionW : objectW; jsdisp_release(dispex); }else { diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5cd97d2..354fdb4 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -922,6 +922,9 @@ ok(re.source === "=(\\?|%3F)", "re.source = " + re.source); ok(createNullBSTR() === '', "createNullBSTR() !== ''"); +ok(getVT(nullDisp) === "VT_DISPATCH", "getVT(nullDisp) = " + typeof(nullDisp)); +ok(typeof(nullDisp) === "object", "typeof(nullDisp) = " + typeof(nullDisp)); + function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index fe8274f..90b022d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -76,6 +76,7 @@ DEFINE_EXPECT(GetItemInfo_testVal); #define DISPID_GLOBAL_GETVT 0x1005 #define DISPID_GLOBAL_TESTOBJ 0x1006 #define DISPID_GLOBAL_NULL_BSTR 0x1007 +#define DISPID_GLOBAL_NULL_DISP 0x1008 static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; @@ -298,6 +299,10 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_NULL_BSTR; return S_OK; } + if(!strcmp_wa(bstrName, "nullDisp")) { + *pid = DISPID_GLOBAL_NULL_DISP; + return S_OK; + } if(!strcmp_wa(bstrName, "notExists")) { CHECK_EXPECT(global_notexists_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); @@ -456,6 +461,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_BSTR(pvarRes) = NULL; } return S_OK; + + case DISPID_GLOBAL_NULL_DISP: + ok(wFlags == INVOKE_PROPERTYGET, "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(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = NULL; + return S_OK; } ok(0, "unexpected call %x\n", id);

1 0

Henri Verbeet : wined3d: Fix some function pointers and typedefs.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: d1f5fa65d04832b785b7e6c4fc1badbf4a44abe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f5fa65d04832b785b7e6c4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 7 11:15:17 2009 +0200 wined3d: Fix some function pointers and typedefs. --- dlls/wined3d/wined3d_gl.h | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9c85d57..79e7a1a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -878,8 +878,8 @@ void (WINE_GLAPI *glEdgeFlagv) (const GLboolean* flag); void (WINE_GLAPI *glEnable) (GLenum cap); void (WINE_GLAPI *glEnableWINE) (GLenum cap); void (WINE_GLAPI *glEnableClientState) (GLenum array); -void (WINE_GLAPI *glEnd) (); -void (WINE_GLAPI *glEndList) (); +void (WINE_GLAPI *glEnd) (void); +void (WINE_GLAPI *glEndList) (void); void (WINE_GLAPI *glEvalCoord1d) (GLdouble u); void (WINE_GLAPI *glEvalCoord1dv) (const GLdouble* u); void (WINE_GLAPI *glEvalCoord1f) (GLfloat u); @@ -904,7 +904,7 @@ void (WINE_GLAPI *glGenTextures) (GLsizei n, GLuint* textures); void (WINE_GLAPI *glGetBooleanv) (GLenum pname, GLboolean* params); void (WINE_GLAPI *glGetClipPlane) (GLenum plane, GLdouble* equation); void (WINE_GLAPI *glGetDoublev) (GLenum pname, GLdouble* params); -GLenum (WINE_GLAPI *glGetError) (); +GLenum (WINE_GLAPI *glGetError) (void); void (WINE_GLAPI *glGetFloatv) (GLenum pname, GLfloat* params); void (WINE_GLAPI *glGetIntegerv) (GLenum pname, GLint* params); void (WINE_GLAPI *glGetLightfv) (GLenum light, GLenum pname, GLfloat* params); @@ -943,7 +943,7 @@ void (WINE_GLAPI *glIndexs) (GLshort c); void (WINE_GLAPI *glIndexsv) (const GLshort* c); void (WINE_GLAPI *glIndexub) (GLubyte c); void (WINE_GLAPI *glIndexubv) (const GLubyte* c); -void (WINE_GLAPI *glInitNames) (); +void (WINE_GLAPI *glInitNames) (void); void (WINE_GLAPI *glInterleavedArrays) (GLenum format, GLsizei stride, const GLvoid* pointer); GLboolean (WINE_GLAPI *glIsEnabled) (GLenum cap); GLboolean (WINE_GLAPI *glIsList) (GLuint list); @@ -959,7 +959,7 @@ void (WINE_GLAPI *glLightiv) (GLenum light, GLenum pname, const GLint* params); void (WINE_GLAPI *glLineStipple) (GLint factor, GLushort pattern); void (WINE_GLAPI *glLineWidth) (GLfloat width); void (WINE_GLAPI *glListBase) (GLuint base); -void (WINE_GLAPI *glLoadIdentity) (); +void (WINE_GLAPI *glLoadIdentity) (void); void (WINE_GLAPI *glLoadMatrixd) (const GLdouble* m); void (WINE_GLAPI *glLoadMatrixf) (const GLfloat* m); void (WINE_GLAPI *glLoadName) (GLuint name); @@ -1005,14 +1005,14 @@ void (WINE_GLAPI *glPointSize) (GLfloat size); void (WINE_GLAPI *glPolygonMode) (GLenum face, GLenum mode); void (WINE_GLAPI *glPolygonOffset) (GLfloat factor, GLfloat units); void (WINE_GLAPI *glPolygonStipple) (const GLubyte* mask); -void (WINE_GLAPI *glPopAttrib) (); -void (WINE_GLAPI *glPopClientAttrib) (); -void (WINE_GLAPI *glPopMatrix) (); -void (WINE_GLAPI *glPopName) (); +void (WINE_GLAPI *glPopAttrib) (void); +void (WINE_GLAPI *glPopClientAttrib) (void); +void (WINE_GLAPI *glPopMatrix) (void); +void (WINE_GLAPI *glPopName) (void); void (WINE_GLAPI *glPrioritizeTextures) (GLsizei n, const GLuint* textures, const GLclampf* priorities); void (WINE_GLAPI *glPushAttrib) (GLbitfield mask); void (WINE_GLAPI *glPushClientAttrib) (GLbitfield mask); -void (WINE_GLAPI *glPushMatrix) (); +void (WINE_GLAPI *glPushMatrix) (void); void (WINE_GLAPI *glPushName) (GLuint name); void (WINE_GLAPI *glRasterPos2d) (GLdouble x, GLdouble y); void (WINE_GLAPI *glRasterPos2dv) (const GLdouble* v); @@ -1146,8 +1146,8 @@ void (WINE_GLAPI *glPointParameterfv) (GLenum pname, const GLfloat *params); * They are wgl functions and must not be called inside the gl lock, give them a * name that makes this clear */ -void (__stdcall *wglFinish) (); -void (__stdcall *wglFlush) (); +void (__stdcall *wglFinish) (void); +void (__stdcall *wglFlush) (void); /* WGL functions */ HGLRC (WINAPI *pwglCreateContext)(HDC); @@ -3031,8 +3031,8 @@ typedef void (WINE_GLAPI * PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target typedef GLuint (WINE_GLAPI *PGLFNGENFRAGMENTSHADERSATI) (GLuint range); typedef void (WINE_GLAPI *PGLFNBINDFRAGMENTSHADERATI) (GLuint id); typedef void (WINE_GLAPI *PGLFNDELETEFRAGMENTSHADERATI) (GLuint id); -typedef void (WINE_GLAPI *PGLFNBEGINFRAGMENTSHADERATI) (); -typedef void (WINE_GLAPI *PGLFNENDFRAGMENTSHADERATI) (); +typedef void (WINE_GLAPI *PGLFNBEGINFRAGMENTSHADERATI) (void); +typedef void (WINE_GLAPI *PGLFNENDFRAGMENTSHADERATI) (void); typedef void (WINE_GLAPI *PGLFNPASSTEXCOORDATI) (GLuint dst, GLuint coord, GLenum swizzle); typedef void (WINE_GLAPI *PGLFNSAMPLEMAPATI) (GLuint dst, GLuint interp, GLenum swizzle); typedef void (WINE_GLAPI *PGLFNCOLORFRAGMENTOP1ATI) (GLenum op, GLuint dst, GLuint dstMask,

1 0

Henri Verbeet : wined3d: Check the correct debug channel in shader_arb_load_constantsF().
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: f8a3a5fd49b768dd1f7db30d8070929b7d2f8229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a3a5fd49b768dd1f7db30d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 7 11:15:16 2009 +0200 wined3d: Check the correct debug channel in shader_arb_load_constantsF(). --- dlls/wined3d/arb_program_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0ac3789..5c971d2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -280,7 +280,8 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl *This, con DWORD i, j; unsigned int ret; - if (TRACE_ON(d3d_shader)) { + if (TRACE_ON(d3d_constants)) + { for(i = 0; i < max_constants; i++) { if(!dirty_consts[i]) continue; TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i,

1 0

Henri Verbeet : wined3d: Fix shader_arb_load_constantsF().
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: f928d6ec871aab8f74802dcc76b2a816b941208d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f928d6ec871aab8f74802dcc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 7 11:15:15 2009 +0200 wined3d: Fix shader_arb_load_constantsF(). --- dlls/wined3d/arb_program_shader.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 848d83d..0ac3789 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -277,7 +277,7 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl *This, con GLuint target_type, unsigned int max_constants, const float *constants, char *dirty_consts) { local_constant* lconst; - DWORD i = 0, j; + DWORD i, j; unsigned int ret; if (TRACE_ON(d3d_shader)) { @@ -288,6 +288,9 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl *This, con constants[i * 4 + 2], constants[i * 4 + 3]); } } + + i = 0; + /* In 1.X pixel shaders constants are implicitly clamped in the range [-1;1] */ if (target_type == GL_FRAGMENT_PROGRAM_ARB && This->baseShader.reg_maps.shader_version.major == 1) {

1 0

Henri Verbeet : d3d10: Implement IsValid() for a few interfaces.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 400ff9f72dfeabf9e29832946679024dcc37e625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=400ff9f72dfeabf9e29832946… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 7 11:15:14 2009 +0200 d3d10: Implement IsValid() for a few interfaces. --- dlls/d3d10/effect.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 61fbfee..eddce29 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1011,9 +1011,9 @@ const struct ID3D10EffectVtbl d3d10_effect_vtbl = static BOOL STDMETHODCALLTYPE d3d10_effect_technique_IsValid(ID3D10EffectTechnique *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p\n", iface); - return FALSE; + return (struct d3d10_effect_technique *)iface != &null_technique; } static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTechnique *iface, @@ -1127,9 +1127,9 @@ static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl = static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p\n", iface); - return FALSE; + return (struct d3d10_effect_pass *)iface != &null_pass; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) @@ -1253,9 +1253,9 @@ static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl = static BOOL STDMETHODCALLTYPE d3d10_effect_variable_IsValid(ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p\n", iface); - return FALSE; + return (struct d3d10_effect_variable *)iface != &null_variable; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_variable_GetType(ID3D10EffectVariable *iface) @@ -1481,9 +1481,9 @@ static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl = /* ID3D10EffectVariable methods */ static BOOL STDMETHODCALLTYPE d3d10_effect_constant_buffer_IsValid(ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p\n", iface); - return FALSE; + return (struct d3d10_effect_local_buffer *)iface != &null_local_buffer; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetType(ID3D10EffectConstantBuffer *iface)

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectSamplerVariable interface.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: cd1afd72eb8a8ca611bd40425b8a8d609968f728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1afd72eb8a8ca611bd40425… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 7 11:15:13 2009 +0200 d3d10: Add the ID3D10EffectSamplerVariable interface. --- include/d3d10effect.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index b61ce91..e020583 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -664,6 +664,44 @@ DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectSamplerVariable, + 0x6530d5c7, 0x07e9, 0x4271, 0xa4, 0x18, 0xe7, 0xce, 0x4b, 0xd1, 0xe4, 0x80); + +#define INTERFACE ID3D10EffectSamplerVariable +DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, 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; + /* ID3D10EffectSamplerVariable methods */ + STDMETHOD(GetSampler)(THIS_ UINT index, ID3D10SamplerState **sampler) PURE; + STDMETHOD(GetBackingStore)(THIS_ UINT index, D3D10_SAMPLER_DESC *desc) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Stefan Dösinger : wined3d: Test and fix ddraw and d3d9 GetDC differences.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: e1469961d42d0eb077d3fa0236de17b56bc51a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1469961d42d0eb077d3fa023… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 5 16:37:19 2009 +0200 wined3d: Test and fix ddraw and d3d9 GetDC differences. The MSDN is not totally correct: A8R8G8B8 and A1R5G5B5 also allow GetDC. The main differences that have to be filtered out in d3d9.dll are GetDC on A8B8G8R8, X8B8G8R8 and P8. --- dlls/d3d9/d3d9_private.h | 2 + dlls/d3d9/device.c | 16 +++ dlls/d3d9/surface.c | 7 ++ dlls/d3d9/tests/surface.c | 81 ++++++++++++++ dlls/ddraw/surface.c | 12 ++- dlls/ddraw/tests/dsurface.c | 234 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 12 +-- dlls/wined3d/surface_base.c | 6 + dlls/wined3d/surface_gdi.c | 21 +++- dlls/wined3d/utils.c | 31 ++++-- dlls/wined3d/wined3d_private.h | 1 + 11 files changed, 394 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1469961d42d0eb077d3f…

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectRasterizerVariable interface.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: a6afc5e0a4c7256b7708a6bfb04896526c28fce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6afc5e0a4c7256b7708a6bfb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 7 11:15:12 2009 +0200 d3d10: Add the ID3D10EffectRasterizerVariable interface. --- include/d3d10effect.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index b96bbe0..b61ce91 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -626,6 +626,44 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectRasterizerVariable, + 0x21af9f0e, 0x4d94, 0x4ea9, 0x97, 0x85, 0x2c, 0xb7, 0x6b, 0x8c, 0x0b, 0x34); + +#define INTERFACE ID3D10EffectRasterizerVariable +DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, 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; + /* ID3D10EffectRasterizerVariable methods */ + STDMETHOD(GetRasterizerState)(THIS_ UINT index, ID3D10RasterizerState **rasterizer_state) PURE; + STDMETHOD(GetBackingStore)(THIS_ UINT index, D3D10_RASTERIZER_DESC *desc) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Stefan Dösinger : wined3d: Only generate the clipplane emulation KIL if a clipplane is used.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: d6547c535b7d7142841f6ab5a580abba27198a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6547c535b7d7142841f6ab5a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 30 21:02:05 2009 +0200 wined3d: Only generate the clipplane emulation KIL if a clipplane is used. The KIL is quite expensive because it forces drivers to disable early Z discard. It is cheaper to generate and switch between two shaders. --- dlls/wined3d/arb_program_shader.c | 19 +++++++++++++++++-- dlls/wined3d/utils.c | 6 ++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a26950c..848d83d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -125,7 +125,8 @@ struct arb_ps_np2fixup_info struct arb_ps_compile_args { struct ps_compile_args super; - DWORD bools; /* WORD is enough, use DWORD for alignment */ + WORD bools; + WORD clip; /* only a boolean, use a WORD for alignment */ unsigned char loop_ctrl[MAX_CONST_I][3]; }; @@ -3496,7 +3497,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct next_local += fixup->super.num_consts; } - if (shader_priv->clipplane_emulation != ~0U) + if (shader_priv->clipplane_emulation != ~0U && args->clip) { shader_addline(buffer, "KIL fragment.texcoord[%u];\n", shader_priv->clipplane_emulation); } @@ -4128,6 +4129,20 @@ static inline void find_arb_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWi if(stateblock->pixelShaderConstantB[i]) args->bools |= ( 1 << i); } + /* Only enable the clip plane emulation KIL if at least one clipplane is enabled. The KIL instruction + * is quite expensive because it forces the driver to disable early Z discards. It is cheaper to + * duplicate the shader than have a no-op KIL instruction in every shader + */ + if((!((IWineD3DDeviceImpl *) shader->baseShader.device)->vs_clipping) && use_vs(stateblock) && + stateblock->renderState[WINED3DRS_CLIPPING] && stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]) + { + args->clip = 1; + } + else + { + args->clip = 0; + } + /* Skip if unused or local, or supported natively */ int_skip = ~shader->baseShader.reg_maps.integer_constants | shader->baseShader.reg_maps.local_int_consts; if(int_skip == 0xffff || GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3c25ebe..ff81078 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2531,9 +2531,11 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } else { settings->sRGB_write = 0; } - if(device->vs_clipping || !use_vs(stateblock)) { + if(device->vs_clipping || !use_vs(stateblock) || !stateblock->renderState[WINED3DRS_CLIPPING] || + !stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]) { /* No need to emulate clipplanes if GL supports native vertex shader clipping or if - * the fixed function vertex pipeline is used(which always supports clipplanes) + * the fixed function vertex pipeline is used(which always supports clipplanes), or + * if no clipplane is enabled */ settings->emul_clipplanes = 0; } else {

1 0