April 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : d3dx9/tests: Cleanup expect_vec.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: c0dabf1e6d2825f58a5cc33bc0035c2e8ab2a115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0dabf1e6d2825f58a5cc33bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:11:01 2017 +0200 d3dx9/tests: Cleanup expect_vec. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 62 +++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 69ca5ad..9aa1df0 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -45,6 +45,11 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static BOOL compare_vec2(const D3DXVECTOR2 *v1, const D3DXVECTOR2 *v2, unsigned int ulps) +{ + return compare_float(v1->x, v2->x, ulps) && compare_float(v1->y, v2->y, ulps); +} + static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int ulps) { return compare_float(c1->r, c2->r, ulps) @@ -85,6 +90,15 @@ static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned return TRUE; } +#define expect_vec2(expected, vector, ulps) expect_vec2_(__LINE__, expected, vector, ulps) +static void expect_vec2_(unsigned int line, const D3DXVECTOR2 *expected, const D3DXVECTOR2 *vector, unsigned int ulps) +{ + BOOL equal = compare_vec2(expected, vector, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected vector {%.8e, %.8e}, expected {%.8e, %.8e}.\n", + vector->x, vector->y, expected->x, expected->y); +} + #define expect_color(expected, color, ulps) expect_color_(__LINE__, expected, color, ulps) static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3DXCOLOR *color, unsigned int ulps) { @@ -182,8 +196,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const i); \ } -#define expect_vec(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); - #define expect_vec3(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error),"Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, gotvec.x, gotvec.y, gotvec.z); #define expect_vec4(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error)&&(relative_error(expectedvec.w, gotvec.w)<admitted_error),"Expected Vector= (%f, %f, %f, %f)\n , Got Vector= (%f, %f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, expectedvec.w, gotvec.x, gotvec.y, gotvec.z, gotvec.w); @@ -1136,7 +1148,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Add__________________________*/ expectedvec.x = -4.0f; expectedvec.y = 13.0f; D3DXVec2Add(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Add(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1146,12 +1158,12 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2BaryCentric___________________*/ expectedvec.x = -12.0f; expectedvec.y = -21.0f; D3DXVec2BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2CatmullRom____________________*/ expectedvec.x = 5820.25f; expectedvec.y = -3654.5625f; D3DXVec2CatmullRom(&gotvec,&u,&v,&w,&x,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2CCW__________________________*/ expected = 55.0f; @@ -1180,7 +1192,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Hermite__________________________*/ expectedvec.x = 2604.625f; expectedvec.y = -4533.0f; D3DXVec2Hermite(&gotvec,&u,&v,&w,&x,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2Length__________________________*/ expected = 5.0f; @@ -1201,20 +1213,20 @@ static void D3DXVector2Test(void) ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /*_______________D3DXVec2Lerp__________________________*/ - expectedvec.x = 68.0f; expectedvec.y = -28.5f; - D3DXVec2Lerp(&gotvec,&u,&v,scale); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 68.0f; expectedvec.y = -28.5f; + D3DXVec2Lerp(&gotvec, &u, &v, scale); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Lerp(&gotvec,NULL,&v,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Lerp(NULL,NULL,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXVec2Maximize__________________________*/ - expectedvec.x = 3.0f; expectedvec.y = 9.0f; - D3DXVec2Maximize(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 3.0f; expectedvec.y = 9.0f; + D3DXVec2Maximize(&gotvec, &u, &v); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Maximize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Maximize(NULL,NULL,NULL); @@ -1223,7 +1235,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Minimize__________________________*/ expectedvec.x = -7.0f; expectedvec.y = 4.0f; D3DXVec2Minimize(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Minimize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1233,16 +1245,16 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Normalize_________________________*/ expectedvec.x = 0.6f; expectedvec.y = 0.8f; D3DXVec2Normalize(&gotvec,&u); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Test the nul vector */ expectedvec.x = 0.0f; expectedvec.y = 0.0f; D3DXVec2Normalize(&gotvec,&nul); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2Scale____________________________*/ expectedvec.x = -19.5f; expectedvec.y = -26.0f; D3DXVec2Scale(&gotvec,&u,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Scale(&gotvec,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1250,10 +1262,10 @@ static void D3DXVector2Test(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXVec2Subtract__________________________*/ - expectedvec.x = 10.0f; expectedvec.y = -5.0f; - D3DXVec2Subtract(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 10.0f; expectedvec.y = -5.0f; + D3DXVec2Subtract(&gotvec, &u, &v); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Subtract(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Subtract(NULL,NULL,NULL); @@ -1270,15 +1282,15 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; D3DXVec2TransformCoord(&gotvec, &u, &mat); - expect_vec(expectedvec, gotvec); + expect_vec2(&expectedvec, &gotvec, 1); gotvec.x = u.x; gotvec.y = u.y; D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); - expect_vec(expectedvec, gotvec); + expect_vec2(&expectedvec, &gotvec, 1); /*_______________D3DXVec2TransformNormal______________________*/ expectedvec.x = 23.0f; expectedvec.y = 30.0f; D3DXVec2TransformNormal(&gotvec,&u,&mat); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); } static void D3DXVector3Test(void)

1 0

Henri Verbeet : d3dx9/tests: Avoid using expect_vec4 for comparing quaternions.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: cbda84abd9aeac48279d9f5d08f4aafc225330c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbda84abd9aeac48279d9f5d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:11:00 2017 +0200 d3dx9/tests: Avoid using expect_vec4 for comparing quaternions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 121 ++++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbda84abd9aeac48279d9…

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_plane.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 2b9425952aabd5b49678e7feb73b0426f89cbf10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9425952aabd5b49678e7feb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:10:59 2017 +0200 d3dx9/tests: Cleanup expect_plane. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9f40d86..85ea4a3 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -53,6 +53,14 @@ static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int && compare_float(c1->a, c2->a, ulps); } +static BOOL compare_plane(const D3DXPLANE *p1, const D3DXPLANE *p2, unsigned int ulps) +{ + return compare_float(p1->a, p2->a, ulps) + && compare_float(p1->b, p2->b, ulps) + && compare_float(p1->c, p2->c, ulps) + && compare_float(p1->d, p2->d, ulps); +} + static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned int ulps) { unsigned int i, j; @@ -78,6 +86,15 @@ static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3 color->r, color->g, color->b, color->a, expected->r, expected->g, expected->b, expected->a); } +#define expect_plane(expected, plane, ulps) expect_plane_(__LINE__, expected, plane, ulps) +static void expect_plane_(unsigned int line, const D3DXPLANE *expected, const D3DXPLANE *plane, unsigned int ulps) +{ + BOOL equal = compare_plane(expected, plane, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected plane {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + plane->a, plane->b, plane->c, plane->d, expected->a, expected->b, expected->c, expected->d); +} + #define expect_matrix(expected, matrix, ulps) expect_matrix_(__LINE__, expected, matrix, ulps) static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const D3DXMATRIX *matrix, unsigned int ulps) { @@ -146,8 +163,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const i); \ } -#define expect_plane(expectedplane,gotplane) ok((relative_error(expectedplane.a, gotplane.a)<admitted_error)&&(relative_error(expectedplane.b, gotplane.b)<admitted_error)&&(relative_error(expectedplane.c, gotplane.c)<admitted_error)&&(relative_error(expectedplane.d, gotplane.d)<admitted_error),"Expected Plane= (%f, %f, %f, %f)\n , Got Plane= (%f, %f, %f, %f)\n", expectedplane.a, expectedplane.b, expectedplane.c, expectedplane.d, gotplane.a, gotplane.b, gotplane.c, gotplane.d); - #define expect_vec(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); #define expect_vec3(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error),"Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, gotvec.x, gotvec.y, gotvec.z); @@ -644,14 +659,14 @@ static void D3DXPlaneTest(void) vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f; expectedplane.a = 17.0f; expectedplane.b = 31.0f; expectedplane.c = 24.0f; expectedplane.d = -950.0f; D3DXPlaneFromPointNormal(&gotplane, &vec1, &vec2); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); gotplane.a = vec2.x; gotplane.b = vec2.y; gotplane.c = vec2.z; D3DXPlaneFromPointNormal(&gotplane, &vec1, (D3DXVECTOR3 *)&gotplane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); gotplane.a = vec1.x; gotplane.b = vec1.y; gotplane.c = vec1.z; expectedplane.d = -1826.0f; D3DXPlaneFromPointNormal(&gotplane, (D3DXVECTOR3 *)&gotplane, &vec2); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); /*_______________D3DXPlaneFromPoints_______*/ vec1.x = 1.0f; vec1.y = 2.0f; vec1.z = 3.0f; @@ -659,7 +674,7 @@ static void D3DXPlaneTest(void) vec3.x = 83.0f; vec3.y = 74.0f; vec3.z = 65.0f; expectedplane.a = 0.085914f; expectedplane.b = -0.704492f; expectedplane.c = 0.704492f; expectedplane.d = -0.790406f; D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 64); /*_______________D3DXPlaneIntersectLine___________*/ vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f; @@ -677,16 +692,16 @@ static void D3DXPlaneTest(void) /*_______________D3DXPlaneNormalize______________*/ expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f); D3DXPlaneNormalize(&gotplane, &plane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 2); nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 0.0f; expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); /*_______________D3DXPlaneTransform____________*/ expectedplane.a = 49.0f; expectedplane.b = -98.0f; expectedplane.c = 55.0f; expectedplane.d = -165.0f; D3DXPlaneTransform(&gotplane,&plane,&mat); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); } static void D3DXQuaternionTest(void)

1 0

Paul Gofman : d3dx9: Reference effect pool implementation in d3dx9_base_effect structure.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 9043ff030ea846e52a56d907f949071e7aa3d799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9043ff030ea846e52a56d907f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 26 12:21:02 2017 +0300 d3dx9: Reference effect pool implementation in d3dx9_base_effect structure. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 84 +++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0f5e3e5..b732c67 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,6 +148,8 @@ struct d3dx9_base_effect struct d3dx_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_object *objects; + + struct d3dx_effect_pool *pool; }; struct ID3DXEffectImpl @@ -171,6 +173,12 @@ struct ID3DXEffectImpl BOOL material_updated; }; +struct d3dx_effect_pool +{ + ID3DXEffectPool ID3DXEffectPool_iface; + LONG refcount; +}; + struct ID3DXEffectCompilerImpl { ID3DXEffectCompiler ID3DXEffectCompiler_iface; @@ -3032,6 +3040,11 @@ static BOOL is_same_parameter(void *param1_, struct d3dx_parameter *param2) return TRUE; } +static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); +} + static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) { return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); @@ -6029,16 +6042,17 @@ err_out: static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect) + UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect, struct d3dx_effect_pool *pool) { DWORD tag, offset; const char *ptr = data; HRESULT hr; ID3DBlob *bytecode = NULL, *temp_errors = NULL; - TRACE("base %p, data %p, data_size %lu, effect %p\n", base, data, data_size, effect); + TRACE("base %p, data %p, data_size %lu, effect %p, pool %p.\n", base, data, data_size, effect, pool); base->effect = effect; + base->pool = pool; read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); @@ -6111,20 +6125,25 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3 UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool) { HRESULT hr; + struct d3dx_effect_pool *pool_impl = NULL; TRACE("effect %p, device %p, data %p, data_size %lu, pool %p\n", effect, device, data, data_size, pool); effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) pool->lpVtbl->AddRef(pool); + if (pool) + { + pool->lpVtbl->AddRef(pool); + pool_impl = impl_from_ID3DXEffectPool(pool); + } effect->pool = pool; IDirect3DDevice9_AddRef(device); effect->device = device; if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include, - eflags, error_messages, effect))) + eflags, error_messages, effect, pool_impl))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect(effect); @@ -6211,7 +6230,7 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil compiler->ref = 1; if (FAILED(hr = d3dx9_base_effect_init(&compiler->base_effect, data, data_size, defines, - include, eflags, error_messages, NULL))) + include, eflags, error_messages, NULL, NULL))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect_compiler(compiler); @@ -6256,21 +6275,10 @@ HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, co return D3D_OK; } -struct ID3DXEffectPoolImpl -{ - ID3DXEffectPool ID3DXEffectPool_iface; - LONG ref; -}; - -static inline struct ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) -{ - return CONTAINING_RECORD(iface, struct ID3DXEffectPoolImpl, ID3DXEffectPool_iface); -} - /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) +static HRESULT WINAPI d3dx_effect_pool_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXEffectPool)) @@ -6285,41 +6293,47 @@ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool *iface) +static ULONG WINAPI d3dx_effect_pool_AddRef(ID3DXEffectPool *iface) { - struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct d3dx_effect_pool *pool = impl_from_ID3DXEffectPool(iface); + ULONG refcount = InterlockedIncrement(&pool->refcount); - TRACE("(%p)->(): AddRef from %u\n", This, This->ref); + TRACE("%p increasing refcount to %u.\n", pool, refcount); - return InterlockedIncrement(&This->ref); + return refcount; } -static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool *iface) +static void free_effect_pool(struct d3dx_effect_pool *pool) { - struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); - ULONG ref = InterlockedDecrement(&This->ref); + HeapFree(GetProcessHeap(), 0, pool); +} - TRACE("(%p)->(): Release from %u\n", This, ref + 1); +static ULONG WINAPI d3dx_effect_pool_Release(ID3DXEffectPool *iface) +{ + struct d3dx_effect_pool *pool = impl_from_ID3DXEffectPool(iface); + ULONG refcount = InterlockedDecrement(&pool->refcount); - if (!ref) - HeapFree(GetProcessHeap(), 0, This); + TRACE("%p decreasing refcount to %u.\n", pool, refcount); - return ref; + if (!refcount) + free_effect_pool(pool); + + return refcount; } static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = { /*** IUnknown methods ***/ - ID3DXEffectPoolImpl_QueryInterface, - ID3DXEffectPoolImpl_AddRef, - ID3DXEffectPoolImpl_Release + d3dx_effect_pool_QueryInterface, + d3dx_effect_pool_AddRef, + d3dx_effect_pool_Release }; HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) { - struct ID3DXEffectPoolImpl *object; + struct d3dx_effect_pool *object; - TRACE("(%p)\n", pool); + TRACE("pool %p.\n", pool); if (!pool) return D3DERR_INVALIDCALL; @@ -6329,7 +6343,7 @@ HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) return E_OUTOFMEMORY; object->ID3DXEffectPool_iface.lpVtbl = &ID3DXEffectPool_Vtbl; - object->ref = 1; + object->refcount = 1; *pool = &object->ID3DXEffectPool_iface;

1 0

Paul Gofman : d3dx9/tests: Add test for releasing pool before effects referencing it.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: eb9febab0393613c804345f8268829d82aea30fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9febab0393613c804345f82… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 26 12:21:03 2017 +0300 d3dx9/tests: Add test for releasing pool before effects referencing it. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9a436d5..dbf91c4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6130,6 +6130,21 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) hr = effect2->lpVtbl->End(effect2); ok(hr == D3D_OK, "Got result %#x.\n", hr); + if (0) + { + refcount = pool->lpVtbl->Release(pool); + ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + + refcount = pool->lpVtbl->Release(pool); + ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + + refcount = pool->lpVtbl->Release(pool); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + + /* Native d3dx crashes in GetFloat(). */ + effect2->lpVtbl->GetFloat(effect2, "arr2[0]", &fvect.x); + } + effect1->lpVtbl->Release(effect1); effect2->lpVtbl->Release(effect2);

1 0

Józef Kucia : d3d11/tests: Introduce check_interface( ) helper.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 31f9c920b7b93b19de4a9e1b55f0163ef07d5307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f9c920b7b93b19de4a9e1b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:58 2017 +0200 d3d11/tests: Introduce check_interface() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 214 ++++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f9c920b7b93b19de4a9…

1 0

Józef Kucia : d3d11/tests: Add test for state refcounting.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: df5576f3cd7a611b7088dfcf0fd7a3f53d8fbda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5576f3cd7a611b7088dfcf0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:42:07 2017 +0200 d3d11/tests: Add test for state refcounting. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5d3b818..97e7775 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18,6 +18,7 @@ */ #include <assert.h> +#include <float.h> #include <stdlib.h> #define COBJMACROS #include "initguid.h" @@ -5291,6 +5292,70 @@ static void test_private_data(void) ok(!refcount, "Test object has %u references left.\n", refcount); } +static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) +{ + ID3D11SamplerState *sampler, *tmp_sampler; + D3D11_SAMPLER_DESC sampler_desc; + struct device_desc device_desc; + ID3D11DeviceContext *context; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + device_desc.feature_level = &feature_level; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", feature_level); + return; + } + + ID3D11Device_GetImmediateContext(device, &context); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 1.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 1.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = FLT_MAX; + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &tmp_sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + tmp_sampler = sampler; + refcount = get_refcount(sampler); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); + refcount = ID3D11SamplerState_Release(sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + sampler = NULL; + ID3D11DeviceContext_PSGetSamplers(context, 0, 1, &sampler); + ok(sampler == tmp_sampler, "Got sampler %p, expected %p.\n", sampler, tmp_sampler); + refcount = ID3D11SamplerState_Release(sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &tmp_sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + refcount = ID3D11SamplerState_Release(tmp_sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_device_context_state(void) { ID3DDeviceContextState *context_state, *previous_context_state; @@ -17679,6 +17744,7 @@ START_TEST(d3d11) test_timestamp_query(); test_device_removed_reason(); test_private_data(); + run_for_each_feature_level(test_state_refcounting); test_device_context_state(); test_blend(); test_texture();

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_vec4.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 739703dc3cba6facc195b8f2c3e3a876dd88a638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739703dc3cba6facc195b8f2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:11:03 2017 +0200 d3dx9/tests: Cleanup expect_vec4. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 52 +++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index a57b620..586be2d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -57,6 +57,14 @@ static BOOL compare_vec3(const D3DXVECTOR3 *v1, const D3DXVECTOR3 *v2, unsigned && compare_float(v1->z, v2->z, ulps); } +static BOOL compare_vec4(const D3DXVECTOR4 *v1, const D3DXVECTOR4 *v2, unsigned int ulps) +{ + return compare_float(v1->x, v2->x, ulps) + && compare_float(v1->y, v2->y, ulps) + && compare_float(v1->z, v2->z, ulps) + && compare_float(v1->w, v2->w, ulps); +} + static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int ulps) { return compare_float(c1->r, c2->r, ulps) @@ -115,6 +123,15 @@ static void expect_vec3_(unsigned int line, const D3DXVECTOR3 *expected, const D vector->x, vector->y, vector->z, expected->x, expected->y, expected->z); } +#define expect_vec4(expected, vector, ulps) expect_vec4_(__LINE__, expected, vector, ulps) +static void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, const D3DXVECTOR4 *vector, unsigned int ulps) +{ + BOOL equal = compare_vec4(expected, vector, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected vector {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + vector->x, vector->y, vector->z, vector->w, expected->x, expected->y, expected->z, expected->w); +} + #define expect_color(expected, color, ulps) expect_color_(__LINE__, expected, color, ulps) static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3DXCOLOR *color, unsigned int ulps) { @@ -212,9 +229,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const i); \ } -#define expect_vec4(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error)&&(relative_error(expectedvec.w, gotvec.w)<admitted_error),"Expected Vector= (%f, %f, %f, %f)\n , Got Vector= (%f, %f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, expectedvec.w, gotvec.x, gotvec.y, gotvec.z, gotvec.w); - - static void D3DXColorTest(void) { D3DXCOLOR color, color1, color2, expected, got; @@ -1288,10 +1302,10 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Transform_______________________*/ expectedtrans.x = 36.0f; expectedtrans.y = 44.0f; expectedtrans.z = 52.0f; expectedtrans.w = 60.0f; D3DXVec2Transform(&gottrans, &u, &mat); - expect_vec4(expectedtrans, gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); gottrans.x = u.x; gottrans.y = u.y; D3DXVec2Transform(&gottrans, (D3DXVECTOR2 *)&gottrans, &mat); - expect_vec4(expectedtrans, gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; @@ -1475,11 +1489,11 @@ static void D3DXVector3Test(void) /*_______________D3DXVec3Transform_______________________*/ expectedtrans.x = 70.0f; expectedtrans.y = 88.0f; expectedtrans.z = 106.0f; expectedtrans.w = 124.0f; D3DXVec3Transform(&gottrans, &u, &mat); - expect_vec4(expectedtrans, gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); gottrans.x = u.x; gottrans.y = u.y; gottrans.z = u.z; D3DXVec3Transform(&gottrans, (D3DXVECTOR3 *)&gottrans, &mat); - expect_vec4(expectedtrans, gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); /*_______________D3DXVec3TransformCoord_______________________*/ expectedvec.x = 70.0f/124.0f; expectedvec.y = 88.0f/124.0f; expectedvec.z = 106.0f/124.0f; @@ -1568,7 +1582,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Add__________________________*/ expectedvec.x = -2.0f; expectedvec.y = 6.0f; expectedvec.z = -1.0f; expectedvec.w = 17.0f; D3DXVec4Add(&gotvec,&u,&v); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Add(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1578,17 +1592,17 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4BaryCentric____________________*/ expectedvec.x = 8.0f; expectedvec.y = 26.0; expectedvec.z = -44.0f; expectedvec.w = -41.0f; D3DXVec4BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4CatmullRom____________________*/ expectedvec.x = 2754.625f; expectedvec.y = 2367.5625f; expectedvec.z = 1060.1875f; expectedvec.w = 131.3125f; D3DXVec4CatmullRom(&gotvec,&u,&v,&w,&x,scale); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Cross_________________________*/ expectedvec.x = 390.0f; expectedvec.y = -393.0f; expectedvec.z = -316.0f; expectedvec.w = 166.0f; D3DXVec4Cross(&gotvec,&u,&v,&w); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Dot__________________________*/ expected = 55.0f; @@ -1605,7 +1619,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Hermite_________________________*/ expectedvec.x = 1224.625f; expectedvec.y = 3461.625f; expectedvec.z = -4758.875f; expectedvec.w = -5781.5f; D3DXVec4Hermite(&gotvec,&u,&v,&w,&x,scale); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Length__________________________*/ expected = 11.0f; @@ -1628,7 +1642,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Lerp__________________________*/ expectedvec.x = 27.0f; expectedvec.y = -11.0f; expectedvec.z = 62.5; expectedvec.w = 29.5; D3DXVec4Lerp(&gotvec,&u,&v,scale); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Lerp(&gotvec,NULL,&v,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1638,7 +1652,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Maximize__________________________*/ expectedvec.x = 1.0f; expectedvec.y = 4.0f; expectedvec.z = 4.0f; expectedvec.w = 10.0; D3DXVec4Maximize(&gotvec,&u,&v); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Maximize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1648,7 +1662,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Minimize__________________________*/ expectedvec.x = -3.0f; expectedvec.y = 2.0f; expectedvec.z = -5.0f; expectedvec.w = 7.0; D3DXVec4Minimize(&gotvec,&u,&v); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Minimize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1658,12 +1672,12 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Normalize_________________________*/ expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; expectedvec.w = 10.0f/11.0f; D3DXVec4Normalize(&gotvec,&u); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 1); /*_______________D3DXVec4Scale____________________________*/ expectedvec.x = -6.5f; expectedvec.y = -13.0f; expectedvec.z = -26.0f; expectedvec.w = -65.0f; D3DXVec4Scale(&gotvec,&u,scale); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Scale(&gotvec,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1673,7 +1687,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Subtract__________________________*/ expectedvec.x = 4.0f; expectedvec.y = -2.0f; expectedvec.z = 9.0f; expectedvec.w = 3.0f; D3DXVec4Subtract(&gotvec,&u,&v); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Subtract(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1683,7 +1697,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Transform_______________________*/ expectedtrans.x = 177.0f; expectedtrans.y = 194.0f; expectedtrans.z = 211.0f; expectedtrans.w = 228.0f; D3DXVec4Transform(&gottrans,&u,&mat); - expect_vec4(expectedtrans,gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); } static void test_matrix_stack(void)

1 0

Józef Kucia : wined3d: Add parent ops for sampler objects.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 5b0fe9cee5b88563d9e30849a6c1c362519191bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0fe9cee5b88563d9e30849a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:54 2017 +0200 wined3d: Add parent ops for sampler objects. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 3 ++- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/sampler.c | 10 +++++++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 0a16e58..c8e443f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1211,7 +1211,8 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc); wined3d_desc.srgb_decode = TRUE; - if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, state, &state->wined3d_sampler))) + if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, + state, &d3d_null_wined3d_parent_ops, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c901e9f..9499f6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -786,7 +786,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 * sampler object is used to emulate the direct resource access when there is no sampler state * to use. */ - if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->default_sampler))) + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->default_sampler))) { ERR("Failed to create default sampler, hr %#x.\n", hr); device->default_sampler = NULL; @@ -799,7 +799,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 desc.mag_filter = WINED3D_TEXF_LINEAR; desc.min_filter = WINED3D_TEXF_LINEAR; desc.mip_filter = WINED3D_TEXF_LINEAR; - if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->null_sampler))) + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->null_sampler))) { ERR("Failed to create null sampler, hr %#x.\n", hr); device->null_sampler = NULL; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 294d766..86d23a0 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -57,7 +57,10 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) + { + sampler->parent_ops->wined3d_object_destroyed(sampler->parent); wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_destroy_object, sampler); + } return refcount; } @@ -112,11 +115,12 @@ static void wined3d_sampler_cs_init(void *object) } static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d_device *device, - const struct wined3d_sampler_desc *desc, void *parent) + const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { sampler->refcount = 1; sampler->device = device; sampler->parent = parent; + sampler->parent_ops = parent_ops; sampler->desc = *desc; if (device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) @@ -124,7 +128,7 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d } HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, struct wined3d_sampler **sampler) + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) { struct wined3d_sampler *object; @@ -143,7 +147,7 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_sampler_init(object, device, desc, parent); + wined3d_sampler_init(object, device, desc, parent, parent_ops); TRACE("Created sampler %p.\n", object); *sampler = object; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 531dd98..12ef3bb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3616,7 +3616,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } else { - if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) + if (FAILED(wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &sampler))) { ERR("Failed to create sampler.\n"); return; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9b8de3e..0f27de3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -223,7 +223,7 @@ @ cdecl wined3d_rendertarget_view_incref(ptr) @ cdecl wined3d_rendertarget_view_set_parent(ptr ptr) -@ cdecl wined3d_sampler_create(ptr ptr ptr ptr) +@ cdecl wined3d_sampler_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_sampler_decref(ptr) @ cdecl wined3d_sampler_get_parent(ptr) @ cdecl wined3d_sampler_incref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 357ceed..751f092 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3110,10 +3110,11 @@ struct wined3d_sampler { struct wine_rb_entry entry; LONG refcount; + GLuint name; struct wined3d_device *device; void *parent; + const struct wined3d_parent_ops *parent_ops; struct wined3d_sampler_desc desc; - GLuint name; }; void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0d85cb4..2d69e98 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2531,7 +2531,7 @@ ULONG __cdecl wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view void __cdecl wined3d_rendertarget_view_set_parent(struct wined3d_rendertarget_view *view, void *parent); HRESULT __cdecl wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, struct wined3d_sampler **sampler); + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler); ULONG __cdecl wined3d_sampler_decref(struct wined3d_sampler *sampler); void * __cdecl wined3d_sampler_get_parent(const struct wined3d_sampler *sampler); ULONG __cdecl wined3d_sampler_incref(struct wined3d_sampler *sampler);

1 0

Piotr Caban : gdi32: Only delete unmodified font keys in delete_external_font_keys.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 3471b59ae03ffba90226b9bb07089dbcdbe29ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3471b59ae03ffba90226b9bb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 25 12:39:29 2017 +0200 gdi32: Only delete unmodified font keys in delete_external_font_keys. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 75d680f..8956720 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3183,9 +3183,10 @@ static void update_reg_entries(void) static void delete_external_font_keys(void) { HKEY winnt_key = 0, win9x_key = 0, external_key = 0; - DWORD dlen, vlen, datalen, valuelen, i, type; + DWORD dlen, plen, vlen, datalen, valuelen, i, type, path_type; LPWSTR valueW; LPVOID data; + BYTE *path; if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL) != ERROR_SUCCESS) { @@ -3211,19 +3212,28 @@ static void delete_external_font_keys(void) valuelen++; /* returned value doesn't include room for '\0' */ valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); data = HeapAlloc(GetProcessHeap(), 0, datalen); + path = HeapAlloc(GetProcessHeap(), 0, datalen); dlen = datalen; vlen = valuelen; i = 0; while(RegEnumValueW(external_key, i++, valueW, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) { + plen = dlen; + if (RegQueryValueExW(winnt_key, valueW, 0, &path_type, path, &plen) == ERROR_SUCCESS && + type == path_type && dlen == plen && !memcmp(data, path, plen)) + RegDeleteValueW(winnt_key, valueW); + + plen = dlen; + if (RegQueryValueExW(win9x_key, valueW, 0, &path_type, path, &plen) == ERROR_SUCCESS && + type == path_type && dlen == plen && !memcmp(data, path, plen)) + RegDeleteValueW(win9x_key, valueW); - RegDeleteValueW(winnt_key, valueW); - RegDeleteValueW(win9x_key, valueW); /* reset dlen and vlen */ dlen = datalen; vlen = valuelen; } + HeapFree(GetProcessHeap(), 0, path); HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, valueW);

1 0