wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Paul Gofman : d3dx9/tests: Initialize boolean constants with the inverse of expected result.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 6930679a906d2539ea3f3249896ccd85cf773789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6930679a906d2539ea3f32498… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:10 2017 +0300 d3dx9/tests: Initialize boolean constants with the inverse of expected result. 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index eaf1647..966f1bd 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4312,12 +4312,13 @@ static const BOOL test_effect_preshader_bconsts[] = static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) { - BOOL bval = FALSE; + BOOL bval; unsigned int i; HRESULT hr; for (i = 0; i < 16; ++i) { + bval = i < ARRAY_SIZE(test_effect_preshader_bconsts) ? !test_effect_preshader_bconsts[i] : FALSE; hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); } @@ -4357,7 +4358,7 @@ static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDire } else { - ok_(__FILE__, line)(!bdata[i], + ok_(__FILE__, line)(bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants updated unexpectedly, parameter %s.\n", updated_param); } }

1 0

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_compare_pbool_consts() function.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: eea701cca0e305745036c26c57f44f40e29178dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea701cca0e305745036c26c5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:09 2017 +0300 d3dx9/tests: Factor out test_effect_preshader_compare_pbool_consts() function. 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 | 79 ++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ad9c553..eaf1647 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4254,7 +4254,7 @@ static const D3DXVECTOR4 test_effect_preshader_fvect_v[] = {91.0f, 0.0f, 0.0f, 0.0f}, {4.0f, 5.0f, 6.0f, 7.0f}, }; -#define TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) +#define TEST_EFFECT_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) #define test_effect_preshader_compare_vconsts(a, b, c) \ test_effect_preshader_compare_vconsts_(__LINE__, a, b, c) @@ -4278,8 +4278,8 @@ static void test_effect_preshader_compare_vconsts_(unsigned int line, IDirect3DD { for (i = 0; i < ARRAY_SIZE(test_effect_preshader_fvect_v); ++i) { - if (const_updated_mask[i / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE] - & (1u << (i % TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE))) + if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] + & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) { ok_(__FILE__, line)(!memcmp(&fdata[i], &test_effect_preshader_fvect_v[i], sizeof(fdata[i])), "Vertex shader float constants do not match, expected (%g, %g, %g, %g), \ @@ -4305,6 +4305,11 @@ got (%g, %g, %g, %g), parameter %s.\n", } } +static const BOOL test_effect_preshader_bconsts[] = +{ + TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE +}; + static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) { BOOL bval = FALSE; @@ -4318,6 +4323,52 @@ static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) } } +#define test_effect_preshader_compare_pbool_consts(a, b, c) \ + test_effect_preshader_compare_pbool_consts_(__LINE__, a, b, c) +static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDirect3DDevice9 *device, + const unsigned int *const_updated_mask, const char *updated_param) +{ + unsigned int i; + BOOL bdata[16]; + HRESULT hr; + + hr = IDirect3DDevice9_GetPixelShaderConstantB(device, 0, bdata, ARRAY_SIZE(bdata)); + ok_(__FILE__, line)(hr == D3D_OK, "Got result %#x.\n", hr); + + if (!const_updated_mask) + { + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) + { + ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], + "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u.\n", + test_effect_preshader_bconsts[i], bdata[i], i); + } + } + else + { + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) + { + if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] + & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) + { + ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], + "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u, parameter %s.\n", + test_effect_preshader_bconsts[i], bdata[i], i, updated_param); + } + else + { + ok_(__FILE__, line)(!bdata[i], + "Pixel shader boolean constants updated unexpectedly, parameter %s.\n", updated_param); + } + } + } + + for (; i < 16; ++i) + { + ok_(__FILE__, line)(!bdata[i], "Got result %#x, boolean register value %u.\n", hr, bdata[i]); + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fvect_p[] = @@ -4337,10 +4388,6 @@ static void test_effect_preshader(IDirect3DDevice9 *device) {11.0f, 21.0f, 31.0f, 0.0f}, {12.0f, 22.0f, 32.0f, 0.0f} }; - static const BOOL test_effect_preshader_bconsts[] = - { - TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE - }; static const int test_effect_preshader_iconsts[][4] = { {4, 3, 2, 1} @@ -4353,10 +4400,8 @@ static void test_effect_preshader(IDirect3DDevice9 *device) D3DXHANDLE par; unsigned int npasses; DWORD value; - BOOL bval; D3DXVECTOR4 fdata[ARRAY_SIZE(test_effect_preshader_fvect_p)]; int idata[ARRAY_SIZE(test_effect_preshader_iconsts)][4]; - BOOL bdata[ARRAY_SIZE(test_effect_preshader_bconsts)]; IDirect3DVertexShader9 *vshader; unsigned int i; D3DCAPS9 caps; @@ -4435,17 +4480,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) "Pixel shader integer constants do not match.\n"); } - hr = IDirect3DDevice9_GetPixelShaderConstantB(device, 0, bdata, - ARRAY_SIZE(test_effect_preshader_bconsts)); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) - ok(!bdata[i] == !test_effect_preshader_bconsts[i], - "Pixel shader boolean constants do not match.\n"); - for (; i < 16; ++i) - { - hr = IDirect3DDevice9_GetPixelShaderConstantB(device, i, &bval, 1); - ok(hr == D3D_OK && !bval, "Got result %#x, boolean register value %u.\n", hr, bval); - } + test_effect_preshader_compare_pbool_consts(device, NULL, NULL); test_effect_preshader_op_results(device, NULL, NULL); @@ -5075,7 +5110,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) { const char *param_name; const unsigned int const_updated_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) - + TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE]; + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; } check_vconsts_parameters[] = { @@ -5093,7 +5128,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) {"ts3", {0x00000fc0, 0x00000000}}, }; static const unsigned int const_no_update_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) - + TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE]; + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; static const D3DLIGHT9 light_filler = {D3DLIGHT_POINT}; ID3DXEffect *effect;

1 0

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_clear_pbool_consts() function.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 2a3ad1d2098a2b0e462a362e4f689de11868da90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3ad1d2098a2b0e462a362e4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:08 2017 +0300 d3dx9/tests: Factor out test_effect_preshader_clear_pbool_consts() function. 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 | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bcb526e..ad9c553 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4305,6 +4305,19 @@ got (%g, %g, %g, %g), parameter %s.\n", } } +static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) +{ + BOOL bval = FALSE; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 16; ++i) + { + hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fvect_p[] = @@ -4368,12 +4381,9 @@ static void test_effect_preshader(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetPixelShaderConstantF(device, i, &fvect_filler.x, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); } - bval = FALSE; - for (i = 0; i < 16; ++i) - { - hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - } + + test_effect_preshader_clear_pbool_consts(device); + for (i = 0; i < 16; ++i) { hr = IDirect3DDevice9_SetPixelShaderConstantI(device, i, ivect_empty, 1);

1 0

Paul Gofman : d3dx9/tests: Extend test for boolean matrix constant setting.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 7178c167423241e7ccbaf3b3f1c0d41aae2b5861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7178c167423241e7ccbaf3b3f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:07 2017 +0300 d3dx9/tests: Extend test for boolean matrix constant setting. 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 | 1010 ++++++++++++++++++++++-------------------- 1 file changed, 520 insertions(+), 490 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7178c167423241e7ccbaf…

1 0

Paul Gofman : d3dx9/tests: Remove a leftover todo_wine_if in test_effect_preshader().
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: b45db52d983e2a78bd7dc2eee555c86f128ffb75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45db52d983e2a78bd7dc2eee… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:06 2017 +0300 d3dx9/tests: Remove a leftover todo_wine_if in test_effect_preshader(). 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 86ea0dd..4315dd1 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4399,7 +4399,6 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ARRAY_SIZE(test_effect_preshader_bconsts)); ok(hr == D3D_OK, "Got result %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) - todo_wine_if(!bdata[i] != !test_effect_preshader_bconsts[i]) ok(!bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants do not match.\n"); for (; i < 16; ++i)

1 0

Paul Gofman : d3dx9: Limit constant size by register count instead of table size.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: ef22e6f0da81fef00a63cd80079804a51029ff99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef22e6f0da81fef00a63cd800… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:05 2017 +0300 d3dx9: Limit constant size by register count instead of table size. 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/preshader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index aaf3961..cc103f5 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1070,14 +1070,15 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int *in; unsigned int offset; - offset = start_offset + i * info.major_stride + j; - if (get_reg_offset(table, offset) >= rs->table_sizes[table]) + offset = i * info.major_stride + j; + if (get_reg_offset(table, offset) >= const_set->register_count) { if (table != PRES_REGTAB_OBCONST) - FIXME("Output offset exceeds table size, name %s, component %u.\n", + FIXME("Output offset exceeds regiser count, name %s, component %u.\n", debugstr_a(param->name), i); break; } + offset += start_offset; if (info.transpose) param_offset = i + j * info.major; else

1 0

Nikolay Sivov : d3drm: Fix IDirect3DRMMeshBuilder:: QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 99e0442acc123a32139cb0a2a3c365a87b33b577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e0442acc123a32139cb0a2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:32 2017 +0300 d3drm: Fix IDirect3DRMMeshBuilder::QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 ++ dlls/d3drm/tests/d3drm.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 82f809e..e53457d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -361,6 +361,8 @@ static HRESULT WINAPI d3drm_mesh_builder2_QueryInterface(IDirect3DRMMeshBuilder2 if (IsEqualGUID(riid, &IID_IDirect3DRMMeshBuilder2) || IsEqualGUID(riid, &IID_IDirect3DRMMeshBuilder) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &mesh_builder->IDirect3DRMMeshBuilder2_iface; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9985d03..e1091be 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -203,6 +203,7 @@ static void test_MeshBuilder(void) HRESULT hr; IDirect3DRM *d3drm; IDirect3DRMMeshBuilder *pMeshBuilder; + IDirect3DRMMeshBuilder3 *meshbuilder3; IDirect3DRMMesh *mesh; D3DRMLOADMEMORY info; int val; @@ -215,6 +216,7 @@ static void test_MeshBuilder(void) DWORD size; D3DCOLOR color; CHAR cname[64] = {0}; + IUnknown *unk; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -222,6 +224,31 @@ static void test_MeshBuilder(void) hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMObject, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr); + ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMVisual, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr); + ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void **)&meshbuilder3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMMeshBuilder3, %#x.\n", hr); + + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMObject, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr); + ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMVisual, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr); + ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + IDirect3DRMMeshBuilder3_Release(meshbuilder3); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, NULL);

1 0

Nikolay Sivov : d3drm: Fix IDirect3DRMMesh:: QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: c75c8e7f537af8fe1711d9c4594d6794d2d3a8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75c8e7f537af8fe1711d9c45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:31 2017 +0300 d3drm: Fix IDirect3DRMMesh::QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 ++ dlls/d3drm/tests/d3drm.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4d5a2a7..82f809e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2322,6 +2322,8 @@ static HRESULT WINAPI d3drm_mesh_QueryInterface(IDirect3DRMMesh *iface, REFIID r TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMMesh) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DRMMesh_AddRef(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 411cd83..9985d03 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -615,6 +615,7 @@ static void test_Mesh(void) IDirect3DRMMesh *mesh; DWORD size; CHAR cname[64] = {0}; + IUnknown *unk; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -635,6 +636,14 @@ static void test_Mesh(void) ok(size == sizeof("Mesh"), "wrong size: %u\n", size); ok(!strcmp(cname, "Mesh"), "Expected cname to be \"Mesh\", but got \"%s\"\n", cname); + hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr); + IUnknown_Release(unk); + + hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr); + IUnknown_Release(unk); + IDirect3DRMMesh_Release(mesh); IDirect3DRM_Release(d3drm);

1 0

Nikolay Sivov : d3drm: Implement CreateTextureFromSurface() and related methods.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: d3e47919bc0dde7b66fe86679bb4b4a85d2866f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e47919bc0dde7b66fe86679… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:30 2017 +0300 d3drm: Implement CreateTextureFromSurface() and related methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 63 +++++++++++++++++++++++++++++++++++++++++----- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 33 ++++++++---------------- dlls/d3drm/texture.c | 53 ++++++++++++++++++++++++++++++-------- 4 files changed, 111 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3e47919bc0dde7b66fe8…

1 0

Nikolay Sivov : d3drm/tests: Some tests for creating texture from ddraw surface.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 824c46207dd538cd81e905072e8094cd5e1ede4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=824c46207dd538cd81e905072… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:29 2017 +0300 d3drm/tests: Some tests for creating texture from ddraw surface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 85af6d2..90820a2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2192,6 +2192,7 @@ static void test_Texture(void) IDirect3DRMTexture *texture1; IDirect3DRMTexture2 *texture2; IDirect3DRMTexture3 *texture3; + IDirectDrawSurface *surface; D3DRMIMAGE initimg = { @@ -2340,6 +2341,11 @@ static void test_Texture(void) ref4 = get_refcount((IUnknown *)d3drm3); ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + /* Created from image, GetSurface() does not work. */ + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &surface); +todo_wine + ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "GetSurface() expected to fail, %#x\n", hr); + /* Test all failures together */ hr = IDirect3DRMTexture_GetClassName(texture1, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); @@ -6535,6 +6541,187 @@ cleanup: DestroyWindow(window); } +static void test_create_texture_from_surface(void) +{ + D3DRMIMAGE testimg = + { + 0, 0, 0, 0, 0, + TRUE, 0, (void *)0xcafebabe, NULL, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL + }; + IDirectDrawSurface *surface = NULL, *surface2 = NULL, *ds = NULL; + IDirect3DRMTexture *texture1; + IDirect3DRMTexture2 *texture2; + IDirect3DRMTexture3 *texture3; + IDirectDraw *ddraw = NULL; + IDirect3DRM *d3drm1 = NULL; + IDirect3DRM2 *d3drm2 = NULL; + IDirect3DRM3 *d3drm3 = NULL; + ULONG ref1, ref2, ref3; + D3DRMIMAGE *image; + DDSURFACEDESC desc; + HWND window; + HRESULT hr; + RECT rc; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = Direct3DRMCreate(&d3drm1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + + /* Create a surface and use it to create a texture. */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + desc.dwWidth = rc.right; + desc.dwHeight = rc.bottom; + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + /* Test NULL params */ + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, &texture1); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1); +} + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, &texture2); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2); +} + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, &texture3); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3); +} + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, surface, &texture1); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture_GetImage(texture1); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture_InitFromSurface(texture1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + IDirect3DRMTexture_Release(texture1); +} + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, surface, &texture2); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture2_GetImage(texture2); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture2_InitFromSurface(texture2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + IDirect3DRMTexture_Release(texture2); +} + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, surface, &texture3); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture3_GetImage(texture3); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture3_InitFromSurface(texture3, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + ok(ds == surface, "Expected same surface back.\n"); + IDirectDrawSurface_Release(ds); + + /* Init already initialized texture with same surface. */ + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + + /* Init already initialized texture with different surface. */ + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface2); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + ok(ds == surface, "Expected same surface back.\n"); + IDirectDrawSurface_Release(ds); + + ref1 = get_refcount((IUnknown *)d3drm1); + ref2 = get_refcount((IUnknown *)d3drm2); + ref3 = get_refcount((IUnknown *)d3drm3); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n"); + ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n"); + ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n"); + /* Release leaked reference to d3drm1 */ + IDirect3DRM_Release(d3drm1); + + IDirect3DRMTexture_Release(texture3); + + /* Create from image, initialize from surface. */ + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + + ref1 = get_refcount((IUnknown *)d3drm1); + ref2 = get_refcount((IUnknown *)d3drm2); + ref3 = get_refcount((IUnknown *)d3drm3); + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n"); + ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n"); + ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n"); + /* Release leaked reference to d3drm1 */ + IDirect3DRM_Release(d3drm1); + + IDirect3DRMTexture3_Release(texture3); +} + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); + IDirectDraw_Release(ddraw); +} + START_TEST(d3drm) { test_MeshBuilder(); @@ -6568,4 +6755,5 @@ START_TEST(d3drm) test_viewport_qi(); test_viewport_clear1(); test_viewport_clear2(); + test_create_texture_from_surface(); }

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017