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

Paul Gofman : d3dx9/tests: Add tests for updating boolean matrices on CommitChanges.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 8bc783ef3011de1404f5fcc418cdcd54deae8dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc783ef3011de1404f5fcc41… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:11 2017 +0300 d3dx9/tests: Add tests for updating boolean matrices on CommitChanges. 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 | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 966f1bd..6ec07a2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5128,6 +5128,17 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) {"arr2", {0x60000000, 0x00000000}}, {"ts3", {0x00000fc0, 0x00000000}}, }; + static const struct + { + const char *param_name; + const unsigned int const_updated_mask[(ARRAY_SIZE(test_effect_preshader_bconsts) + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; + } + check_bconsts_parameters[] = + { + {"mb2x3row", {0x0000001f}}, + {"mb2x3column", {0x00000060}}, + }; static const unsigned int const_no_update_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; static const D3DLIGHT9 light_filler = {D3DLIGHT_POINT}; @@ -5139,6 +5150,8 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) int ivect[4]; D3DXVECTOR4 fvect; IDirect3DVertexShader9 *vshader; + unsigned char buffer[256]; + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), NULL, NULL, 0, NULL, &effect, NULL); @@ -5180,8 +5193,6 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) for (i = 0; i < ARRAY_SIZE(check_vconsts_parameters); ++i) { - unsigned char buffer[256]; - test_effect_preshader_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, check_vconsts_parameters[i].param_name); ok(!!param, "GetParameterByName failed.\n"); @@ -5196,6 +5207,22 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) check_vconsts_parameters[i].param_name); } + for (i = 0; i < ARRAY_SIZE(check_bconsts_parameters); ++i) + { + test_effect_preshader_clear_pbool_consts(device); + param = effect->lpVtbl->GetParameterByName(effect, NULL, check_bconsts_parameters[i].param_name); + ok(!!param, "GetParameterByName failed.\n"); + hr = effect->lpVtbl->GetValue(effect, param, buffer, sizeof(buffer)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetValue(effect, param, buffer, sizeof(buffer)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_pbool_consts(device, check_bconsts_parameters[i].const_updated_mask, + check_bconsts_parameters[i].param_name); + } + test_effect_preshader_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_Selector"); ok(!!param, "GetParameterByName failed.\n");

1 0

Paul Gofman : d3dx9/tests: Remove a leftover todo_wine_if in test_effect_preshader().
by Alexandre Julliard June 5, 2017

June 5, 2017

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

Nikolay Sivov : d3drm: Fix IDirect3DRMMeshBuilder:: QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual.
by Alexandre Julliard June 5, 2017

June 5, 2017

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: Implement CreateTextureFromSurface() and related methods.
by Alexandre Julliard June 5, 2017

June 5, 2017

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

Józef Kucia : d3d11/tests: Add additional test for pipeline statistics query with no pixel shader.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 00dbc36f66e02711ebff106d01fcb95504f16ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00dbc36f66e02711ebff106d0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 5 00:47:39 2017 +0200 d3d11/tests: Add additional test for pipeline statistics query with no pixel shader. 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 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a723e69..a3f2c98 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4927,8 +4927,25 @@ static void test_pipeline_statistics_query(void) todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ok(data.IAVertices == ~(UINT64)0, "Data was modified.\n"); - draw_color_quad(&test_context, &red); + draw_quad(&test_context); + + ID3D11DeviceContext_End(context, query); + get_query_data(context, query, &data, sizeof(data)); + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + todo_wine + ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); + ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); + ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + ID3D11DeviceContext_Begin(context, query); + draw_color_quad(&test_context, &red); ID3D11DeviceContext_End(context, query); get_query_data(context, query, &data, sizeof(data)); ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices);

1 0

Józef Kucia : wined3d: Rearrange wined3d_query_type enum values.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 10748ab9d8d8103cd00da16453bcdda5e1983967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10748ab9d8d8103cd00da1645… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 5 00:47:38 2017 +0200 wined3d: Rearrange wined3d_query_type enum values. 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/wined3d/query.c | 26 +++++++------------------- include/wine/wined3d.h | 12 ++++++------ 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 2af2048..8445922 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1066,6 +1066,12 @@ static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_so_statistics_query *object; + unsigned int stream_idx; + + if (WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) + stream_idx = type - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0; + else + return WINED3DERR_NOTAVAILABLE; TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", device, type, parent, parent_ops, query); @@ -1084,27 +1090,9 @@ static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - switch (type) - { - case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: - object->stream_idx = 0; - break; - case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: - object->stream_idx = 1; - break; - case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: - object->stream_idx = 2; - break; - case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: - object->stream_idx = 3; - break; - default: - HeapFree(GetProcessHeap(), 0, object); - return WINED3DERR_NOTAVAILABLE; - } - wined3d_query_init(&object->query, device, type, &object->statistics, sizeof(object->statistics), &so_statistics_query_ops, parent, parent_ops); + object->stream_idx = stream_idx; TRACE("Created query %p.\n", object); *query = &object->query; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7a64608..d176ab1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -705,12 +705,12 @@ enum wined3d_query_type WINED3D_QUERY_TYPE_SO_STATISTICS = 21, WINED3D_QUERY_TYPE_SO_OVERFLOW = 22, WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0 = 23, - WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM0 = 24, - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 = 25, - WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM1 = 26, - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2 = 27, - WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM2 = 28, - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3 = 29, + WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 = 24, + WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2 = 25, + WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3 = 26, + WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM0 = 27, + WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM1 = 28, + WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM2 = 29, WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM3 = 30, };

1 0

Francois Gouget : wsdapi: Add a trailing '\n' to a TRACE() message.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: d65f7c79d8db7e4a9dbfd9847bc01f95de05ad7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65f7c79d8db7e4a9dbfd9847… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:41:36 2017 +0200 wsdapi: Add a trailing '\n' to a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index a6d0b07..71e9661 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -601,7 +601,7 @@ HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext) { IWSDXMLContextImpl *obj; - TRACE("(%p)", ppContext); + TRACE("(%p)\n", ppContext); if (ppContext == NULL) {

1 0

Francois Gouget : oleaut32: Make VARIANT_GetLocalisedText() static.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 4be8d8392c1f80852695f022c88d4ea18a934fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be8d8392c1f80852695f022c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:39:20 2017 +0200 oleaut32: Make VARIANT_GetLocalisedText() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.h | 1 - dlls/oleaut32/vartype.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 9436cb3..76444cf 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -115,7 +115,6 @@ typedef struct tagVARIANT_NUMBER_CHARS } VARIANT_NUMBER_CHARS; unsigned int get_type_size(ULONG*, VARTYPE) DECLSPEC_HIDDEN; -BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *, const WCHAR *, WCHAR *, int) DECLSPEC_HIDDEN; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index aab4d33..881fe20 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6061,7 +6061,7 @@ HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL *pBoolOut) * Get a localized string from the resources * */ -BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) +static BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) { HRSRC hrsrc;

1 0

Francois Gouget : odbccp32/tests: Make test_SQLInstallTranslatorEx() static.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 522385f619f025fba360ca4e158640da7be2d3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=522385f619f025fba360ca4e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:39:05 2017 +0200 odbccp32/tests: Make test_SQLInstallTranslatorEx() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 8e119e0..4a72ad0 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -530,7 +530,7 @@ if (0) /* Crashes on XP. */ ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); } -void test_SQLInstallTranslatorEx(void) +static void test_SQLInstallTranslatorEx(void) { char path[MAX_PATH]; char syspath[MAX_PATH];

1 0

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_compare_pbool_consts() function.
by Alexandre Julliard June 5, 2017

June 5, 2017

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