Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 41/74: [WINESYNC]: d3dx9 is now in sync with wine-staging wine-4.1

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e562617a84ea7aaf3cac0… commit e562617a84ea7aaf3cac0eea44d014a2de856afa Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Jan 4 02:11:44 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]: d3dx9 is now in sync with wine-staging wine-4.1 --- sdk/tools/winesync/d3dx9.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index 935c60203af..4ec5b15c894 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -33,4 +33,4 @@ files: include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h tags: - wine: 956d7356e0559a07aac68bcaf73a5005e0600fad + wine: wine-4.1

4 years, 10 months

[reactos] 40/74: [WINESYNC]d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=692992f2bf0d703c02800… commit 692992f2bf0d703c0280094df166fe4506cfa519 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh. This patch fixes last problem of bug 32572. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/skin.c | 86 ++++++++- modules/rostests/winetests/d3dx9_36/mesh.c | 83 +++++++++ ...lement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff | 206 +++++++++++++++++++++ 3 files changed, 372 insertions(+), 3 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c index bed4b9f49d2..0a305a99236 100644 --- a/dll/directx/wine/d3dx9_36/skin.c +++ b/dll/directx/wine/d3dx9_36/skin.c @@ -2,6 +2,7 @@ * Skin Info operations specific to D3DX9. * * Copyright (C) 2011 Dylan Smith + * Copyright (C) 2013 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -377,10 +378,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface, static HRESULT WINAPI d3dx9_skin_info_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms, const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices) { - FIXME("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p stub!\n", - iface, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); + struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); + DWORD size = D3DXGetFVFVertexSize(skin->fvf); + DWORD i, j; - return E_NOTIMPL; + TRACE("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p\n", + skin, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); + + if (bone_inv_transpose_transforms) + FIXME("Skinning vertices with two position elements not supported\n"); + + if ((skin->fvf & D3DFVF_POSITION_MASK) != D3DFVF_XYZ) { + FIXME("Vertex type %#x not supported\n", skin->fvf & D3DFVF_POSITION_MASK); + return E_FAIL; + } + + /* Reset all positions */ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *position = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i); + position->x = 0.0f; + position->y = 0.0f; + position->z = 0.0f; + } + + /* Update positions that are influenced by bones */ + for (i = 0; i < skin->num_bones; i++) { + D3DXMATRIX bone_inverse, matrix; + + D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); + D3DXMatrixMultiply(&matrix, &bone_transforms[i], &bone_inverse); + D3DXMatrixMultiply(&matrix, &matrix, &skin->bones[i].transform); + + for (j = 0; j < skin->bones[i].num_influences; j++) { + D3DXVECTOR3 position; + D3DXVECTOR3 *position_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j]); + D3DXVECTOR3 *position_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j]); + FLOAT weight = skin->bones[i].weights[j]; + + D3DXVec3TransformCoord(&position, position_src, &matrix); + position_dest->x += weight * position.x; + position_dest->y += weight * position.y; + position_dest->z += weight * position.z; + } + } + + if (skin->fvf & D3DFVF_NORMAL) { + /* Reset all normals */ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *normal = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i + sizeof(D3DXVECTOR3)); + normal->x = 0.0f; + normal->y = 0.0f; + normal->z = 0.0f; + } + + /* Update normals that are influenced by bones */ + for (i = 0; i < skin->num_bones; i++) { + D3DXMATRIX bone_inverse, matrix; + + D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); + D3DXMatrixMultiply(&matrix, &skin->bones[i].transform, &bone_transforms[i]); + + for (j = 0; j < skin->bones[i].num_influences; j++) { + D3DXVECTOR3 normal; + D3DXVECTOR3 *normal_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); + D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); + FLOAT weight = skin->bones[i].weights[j]; + + D3DXVec3TransformNormal(&normal, normal_src, &bone_inverse); + D3DXVec3TransformNormal(&normal, &normal, &matrix); + normal_dest->x += weight * normal.x; + normal_dest->y += weight * normal.y; + normal_dest->z += weight * normal.z; + } + } + + /* Normalize all normals that are influenced by bones*/ + for (i = 0; i < skin->num_vertices; i++) { + D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + (i * size) + sizeof(D3DXVECTOR3)); + if ((normal_dest->x != 0.0f) && (normal_dest->y != 0.0f) && (normal_dest->z != 0.0f)) + D3DXVec3Normalize(normal_dest, normal_dest); + } + } + + return D3D_OK; } static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index 35dd6c4c3b0..77f513f78dc 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -5316,6 +5316,88 @@ static void test_create_skin_info(void) ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); } +static void test_update_skinned_mesh(void) +{ + static DWORD bone0_vertices[2] = { 1, 3 }; + static FLOAT bone0_weights[2] = { 1.0f, 0.5f }; + static DWORD bone1_vertices[2] = { 2, 3 }; + static FLOAT bone1_weights[2] = { 1.0f, 0.5f }; + static D3DMATRIX bones_matrix[2] = + { { { { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 2.0f, 2.0f, 4.0f, 1.0f + } } }, + { { { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + -4.0f, -4.0f, 4.0f, 1.0f + } } } }; + static D3DVECTOR vertices_src[] = {{ 1.0f, 1.0f, 1.0f }, + { 1.0f, 0.0f, 0.0f }, + { 1.0f, 1.0f, -1.0f }, + { 0.0f, 1.0f, 0.0f }, + { -1.0f, -1.0f, 1.0f }, + { 0.0f, 0.0f, 1.0f }, + { -1.0f, -1.0f, -1.0f }, + { -1.0f, 0.0f, 0.0f }, + }; + static D3DVECTOR vertices_ref[] = {{ 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f }, + { 3.0f, 3.0f, 3.0f }, + { 0.0f, 1.0f, 0.0f }, + { -5.0f, -5.0f, 5.0f }, + { 0.0f, 0.0f, 1.0f }, + { -2.0f, -2.0f, 3.0f }, + { -1.0f, 0.0f, 0.0f }, + }; + D3DVECTOR vertices_dest[8]; + HRESULT hr; + ID3DXSkinInfo *skin_info; + D3DXMATRIX matrix; + int i; + + D3DXMatrixIdentity(&matrix); + for (i = 0; i < 8; i++) + { + vertices_dest[i].x = 10000.0f; + vertices_dest[i].y = 10000.0f; + vertices_dest[i].z = 10000.0f; + } + + hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + + skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + for (i = 0; i < 4; i++) + { + ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n", + i, vertices_dest[i*2].x, vertices_ref[i*2].x); + ok(compare(vertices_dest[i*2].y, vertices_ref[i*2].y), "Vertex[%d].position.y: got %g, expected %g\n", + i, vertices_dest[i*2].y, vertices_ref[i*2].y); + ok(compare(vertices_dest[i*2].z, vertices_ref[i*2].z), "Vertex[%d].position.z: got %g, expected %g\n", + i, vertices_dest[i*2].z, vertices_ref[i*2].z); + ok(compare(vertices_dest[i*2+1].x, vertices_ref[i*2+1].x), "Vertex[%d].normal.x: got %g, expected %g\n", + i, vertices_dest[i*2+1].x, vertices_ref[i*2+1].x); + ok(compare(vertices_dest[i*2+1].y, vertices_ref[i*2+1].y), "Vertex[%d].normal.y: got %g, expected %g\n", + i, vertices_dest[i*2+1].y, vertices_ref[i*2+1].y); + ok(compare(vertices_dest[i*2+1].z, vertices_ref[i*2+1].z), "Vertex[%d].normal.z: got %g, expected %g\n", + i, vertices_dest[i*2+1].z, vertices_ref[i*2+1].z); + } + skin_info->lpVtbl->Release(skin_info); +} + static void test_convert_adjacency_to_point_reps(void) { HRESULT hr; @@ -11393,6 +11475,7 @@ START_TEST(mesh) D3DXGenerateAdjacencyTest(); test_update_semantics(); test_create_skin_info(); + test_update_skinned_mesh(); test_convert_adjacency_to_point_reps(); test_convert_point_reps_to_adjacency(); test_weld_vertices(); diff --git a/sdk/tools/winesync/d3dx9_staging/0024-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff b/sdk/tools/winesync/d3dx9_staging/0024-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff new file mode 100644 index 00000000000..9ef27a4688c --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0024-d3dx9_36__Implement_ID3DXSkinInfoImpl_UpdateSkinnedMesh.diff @@ -0,0 +1,206 @@ +diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c +index bed4b9f..0a305a9 100644 +--- a/dll/directx/wine/d3dx9_36/skin.c ++++ b/dll/directx/wine/d3dx9_36/skin.c +@@ -2,6 +2,7 @@ + * Skin Info operations specific to D3DX9. + * + * Copyright (C) 2011 Dylan Smith ++ * Copyright (C) 2013 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -377,10 +378,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface, + static HRESULT WINAPI d3dx9_skin_info_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms, + const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices) + { +- FIXME("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p stub!\n", +- iface, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); ++ struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); ++ DWORD size = D3DXGetFVFVertexSize(skin->fvf); ++ DWORD i, j; + +- return E_NOTIMPL; ++ TRACE("iface %p, bone_transforms %p, bone_inv_transpose_transforms %p, src_vertices %p, dst_vertices %p\n", ++ skin, bone_transforms, bone_inv_transpose_transforms, src_vertices, dst_vertices); ++ ++ if (bone_inv_transpose_transforms) ++ FIXME("Skinning vertices with two position elements not supported\n"); ++ ++ if ((skin->fvf & D3DFVF_POSITION_MASK) != D3DFVF_XYZ) { ++ FIXME("Vertex type %#x not supported\n", skin->fvf & D3DFVF_POSITION_MASK); ++ return E_FAIL; ++ } ++ ++ /* Reset all positions */ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *position = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i); ++ position->x = 0.0f; ++ position->y = 0.0f; ++ position->z = 0.0f; ++ } ++ ++ /* Update positions that are influenced by bones */ ++ for (i = 0; i < skin->num_bones; i++) { ++ D3DXMATRIX bone_inverse, matrix; ++ ++ D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); ++ D3DXMatrixMultiply(&matrix, &bone_transforms[i], &bone_inverse); ++ D3DXMatrixMultiply(&matrix, &matrix, &skin->bones[i].transform); ++ ++ for (j = 0; j < skin->bones[i].num_influences; j++) { ++ D3DXVECTOR3 position; ++ D3DXVECTOR3 *position_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j]); ++ D3DXVECTOR3 *position_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j]); ++ FLOAT weight = skin->bones[i].weights[j]; ++ ++ D3DXVec3TransformCoord(&position, position_src, &matrix); ++ position_dest->x += weight * position.x; ++ position_dest->y += weight * position.y; ++ position_dest->z += weight * position.z; ++ } ++ } ++ ++ if (skin->fvf & D3DFVF_NORMAL) { ++ /* Reset all normals */ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *normal = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * i + sizeof(D3DXVECTOR3)); ++ normal->x = 0.0f; ++ normal->y = 0.0f; ++ normal->z = 0.0f; ++ } ++ ++ /* Update normals that are influenced by bones */ ++ for (i = 0; i < skin->num_bones; i++) { ++ D3DXMATRIX bone_inverse, matrix; ++ ++ D3DXMatrixInverse(&bone_inverse, NULL, &skin->bones[i].transform); ++ D3DXMatrixMultiply(&matrix, &skin->bones[i].transform, &bone_transforms[i]); ++ ++ for (j = 0; j < skin->bones[i].num_influences; j++) { ++ D3DXVECTOR3 normal; ++ D3DXVECTOR3 *normal_src = (D3DXVECTOR3*)((BYTE*)src_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); ++ D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + size * skin->bones[i].vertices[j] + sizeof(D3DXVECTOR3)); ++ FLOAT weight = skin->bones[i].weights[j]; ++ ++ D3DXVec3TransformNormal(&normal, normal_src, &bone_inverse); ++ D3DXVec3TransformNormal(&normal, &normal, &matrix); ++ normal_dest->x += weight * normal.x; ++ normal_dest->y += weight * normal.y; ++ normal_dest->z += weight * normal.z; ++ } ++ } ++ ++ /* Normalize all normals that are influenced by bones*/ ++ for (i = 0; i < skin->num_vertices; i++) { ++ D3DXVECTOR3 *normal_dest = (D3DXVECTOR3*)((BYTE*)dst_vertices + (i * size) + sizeof(D3DXVECTOR3)); ++ if ((normal_dest->x != 0.0f) && (normal_dest->y != 0.0f) && (normal_dest->z != 0.0f)) ++ D3DXVec3Normalize(normal_dest, normal_dest); ++ } ++ } ++ ++ return D3D_OK; + } + + static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, +diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c +index ea0b867..c12bf60 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -5316,6 +5316,88 @@ static void test_create_skin_info(void) + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + } + ++static void test_update_skinned_mesh(void) ++{ ++ static DWORD bone0_vertices[2] = { 1, 3 }; ++ static FLOAT bone0_weights[2] = { 1.0f, 0.5f }; ++ static DWORD bone1_vertices[2] = { 2, 3 }; ++ static FLOAT bone1_weights[2] = { 1.0f, 0.5f }; ++ static D3DMATRIX bones_matrix[2] = ++ { { { { ++ 1.0f, 0.0f, 0.0f, 0.0f, ++ 0.0f, 1.0f, 0.0f, 0.0f, ++ 0.0f, 0.0f, 1.0f, 0.0f, ++ 2.0f, 2.0f, 4.0f, 1.0f ++ } } }, ++ { { { ++ 1.0f, 0.0f, 0.0f, 0.0f, ++ 0.0f, 1.0f, 0.0f, 0.0f, ++ 0.0f, 0.0f, 1.0f, 0.0f, ++ -4.0f, -4.0f, 4.0f, 1.0f ++ } } } }; ++ static D3DVECTOR vertices_src[] = {{ 1.0f, 1.0f, 1.0f }, ++ { 1.0f, 0.0f, 0.0f }, ++ { 1.0f, 1.0f, -1.0f }, ++ { 0.0f, 1.0f, 0.0f }, ++ { -1.0f, -1.0f, 1.0f }, ++ { 0.0f, 0.0f, 1.0f }, ++ { -1.0f, -1.0f, -1.0f }, ++ { -1.0f, 0.0f, 0.0f }, ++ }; ++ static D3DVECTOR vertices_ref[] = {{ 0.0f, 0.0f, 0.0f }, ++ { 0.0f, 0.0f, 0.0f }, ++ { 3.0f, 3.0f, 3.0f }, ++ { 0.0f, 1.0f, 0.0f }, ++ { -5.0f, -5.0f, 5.0f }, ++ { 0.0f, 0.0f, 1.0f }, ++ { -2.0f, -2.0f, 3.0f }, ++ { -1.0f, 0.0f, 0.0f }, ++ }; ++ D3DVECTOR vertices_dest[8]; ++ HRESULT hr; ++ ID3DXSkinInfo *skin_info; ++ D3DXMATRIX matrix; ++ int i; ++ ++ D3DXMatrixIdentity(&matrix); ++ for (i = 0; i < 8; i++) ++ { ++ vertices_dest[i].x = 10000.0f; ++ vertices_dest[i].y = 10000.0f; ++ vertices_dest[i].z = 10000.0f; ++ } ++ ++ hr = D3DXCreateSkinInfoFVF(4, D3DFVF_XYZ | D3DFVF_NORMAL, 2, &skin_info); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ ++ skin_info->lpVtbl->SetBoneInfluence(skin_info, 0, 2, bone0_vertices, bone0_weights); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 0, &matrix); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneInfluence(skin_info, 1, 2, bone1_vertices, bone1_weights); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->SetBoneOffsetMatrix(skin_info, 1, &matrix); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ skin_info->lpVtbl->UpdateSkinnedMesh(skin_info, bones_matrix, NULL, vertices_src, vertices_dest); ++ ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ++ for (i = 0; i < 4; i++) ++ { ++ ok(compare(vertices_dest[i*2].x, vertices_ref[i*2].x), "Vertex[%d].position.x: got %g, expected %g\n", ++ i, vertices_dest[i*2].x, vertices_ref[i*2].x); ++ ok(compare(vertices_dest[i*2].y, vertices_ref[i*2].y), "Vertex[%d].position.y: got %g, expected %g\n", ++ i, vertices_dest[i*2].y, vertices_ref[i*2].y); ++ ok(compare(vertices_dest[i*2].z, vertices_ref[i*2].z), "Vertex[%d].position.z: got %g, expected %g\n", ++ i, vertices_dest[i*2].z, vertices_ref[i*2].z); ++ ok(compare(vertices_dest[i*2+1].x, vertices_ref[i*2+1].x), "Vertex[%d].normal.x: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].x, vertices_ref[i*2+1].x); ++ ok(compare(vertices_dest[i*2+1].y, vertices_ref[i*2+1].y), "Vertex[%d].normal.y: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].y, vertices_ref[i*2+1].y); ++ ok(compare(vertices_dest[i*2+1].z, vertices_ref[i*2+1].z), "Vertex[%d].normal.z: got %g, expected %g\n", ++ i, vertices_dest[i*2+1].z, vertices_ref[i*2+1].z); ++ } ++ skin_info->lpVtbl->Release(skin_info); ++} ++ + static void test_convert_adjacency_to_point_reps(void) + { + HRESULT hr; +@@ -11362,6 +11444,7 @@ START_TEST(mesh) + D3DXGenerateAdjacencyTest(); + test_update_semantics(); + test_create_skin_info(); ++ test_update_skinned_mesh(); + test_convert_adjacency_to_point_reps(); + test_convert_point_reps_to_adjacency(); + test_weld_vertices();

4 years, 10 months

[reactos] 39/74: [WINESYNC]d3dx9_36: Align texture dimensions to block size for compressed textures in D3DXCheckTextureRequirements.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81c78a0a6b1da9e0d59b5… commit 81c78a0a6b1da9e0d59b54e7f7bca0c023fab3a6 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Align texture dimensions to block size for compressed textures in D3DXCheckTextureRequirements. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/texture.c | 8 ++--- modules/rostests/winetests/d3dx9_36/texture.c | 10 ++++++ ...d_textures_in_D3DXCheckTextureRequirements.diff | 40 ++++++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c index 9f0e541cb61..552d02a30e9 100644 --- a/dll/directx/wine/d3dx9_36/texture.c +++ b/dll/directx/wine/d3dx9_36/texture.c @@ -335,10 +335,10 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN if (fmt->block_width != 1 || fmt->block_height != 1) { - if (w < fmt->block_width) - w = fmt->block_width; - if (h < fmt->block_height) - h = fmt->block_height; + if (w % fmt->block_width) + w += fmt->block_width - w % fmt->block_width; + if (h % fmt->block_height) + h += fmt->block_height - h % fmt->block_height; } if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) diff --git a/modules/rostests/winetests/d3dx9_36/texture.c b/modules/rostests/winetests/d3dx9_36/texture.c index 6c25a158118..98a9fc344db 100644 --- a/modules/rostests/winetests/d3dx9_36/texture.c +++ b/modules/rostests/winetests/d3dx9_36/texture.c @@ -400,6 +400,16 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(height == 4, "Returned height %d, expected %d\n", height, 4); ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + + format = D3DFMT_DXT5; + width = 5; height = 5; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 8, "Returned width %d, expected %d\n", width, 8); + ok(height == 8, "Returned height %d, expected %d\n", height, 8); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); } else { diff --git a/sdk/tools/winesync/d3dx9_staging/0023-d3dx9_36__Align_texture_dimensions_to_block_size_for_compressed_textures_in_D3DXCheckTextureRequirements.diff b/sdk/tools/winesync/d3dx9_staging/0023-d3dx9_36__Align_texture_dimensions_to_block_size_for_compressed_textures_in_D3DXCheckTextureRequirements.diff new file mode 100644 index 00000000000..07ae161b293 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0023-d3dx9_36__Align_texture_dimensions_to_block_size_for_compressed_textures_in_D3DXCheckTextureRequirements.diff @@ -0,0 +1,40 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/texture.c b/modules/rostests/winetests/d3dx9_36/texture.c +index 6c25a15..98a9fc3 100644 +--- a/modules/rostests/winetests/d3dx9_36/texture.c ++++ b/modules/rostests/winetests/d3dx9_36/texture.c +@@ -400,6 +400,16 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) + ok(height == 4, "Returned height %d, expected %d\n", height, 4); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); ++ ++ format = D3DFMT_DXT5; ++ width = 5; height = 5; ++ mipmaps = 1; ++ hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); ++ ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ++ ok(width == 8, "Returned width %d, expected %d\n", width, 8); ++ ok(height == 8, "Returned height %d, expected %d\n", height, 8); ++ ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); ++ ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + } + else + { +diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c +index 9f0e541..552d02a 100644 +--- a/dll/directx/wine/d3dx9_36/texture.c ++++ b/dll/directx/wine/d3dx9_36/texture.c +@@ -335,10 +335,10 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN + + if (fmt->block_width != 1 || fmt->block_height != 1) + { +- if (w < fmt->block_width) +- w = fmt->block_width; +- if (h < fmt->block_height) +- h = fmt->block_height; ++ if (w % fmt->block_width) ++ w += fmt->block_width - w % fmt->block_width; ++ if (h % fmt->block_height) ++ h += fmt->block_height - h % fmt->block_height; + } + + if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w)))

4 years, 10 months

[reactos] 38/74: [WINESYNC]d3dx9_36: No need to fail if we don't support vertices reordering in D3DXMESHOPT_ATTRSORT

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afac88c50e1e30fc5d4cd… commit afac88c50e1e30fc5d4cd9b63521849e57568747 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: No need to fail if we don't support vertices reordering in D3DXMESHOPT_ATTRSORT A non optimized mesh does not prevent rendering as long as we return valid data to the application. In our case we provided an identity remapping array when no vertices reordering is done. Avencast demo works perfectly well (using native effects functions). wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/mesh.c | 4 ---- ...port_vertices_reordering_in_D3DXMESHOPT_ATTRSORT.diff | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index 898a88c1131..b1d9f68ade1 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -1695,11 +1695,7 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, if (FAILED(hr)) goto cleanup; } else if (flags & D3DXMESHOPT_ATTRSORT) { if (!(flags & D3DXMESHOPT_IGNOREVERTS)) - { FIXME("D3DXMESHOPT_ATTRSORT vertex reordering not implemented.\n"); - hr = E_NOTIMPL; - goto cleanup; - } hr = iface->lpVtbl->LockAttributeBuffer(iface, 0, &attrib_buffer); if (FAILED(hr)) goto cleanup; diff --git a/sdk/tools/winesync/d3dx9_staging/0022-d3dx9_36__No_need_to_fail_if_we_don_t_support_vertices_reordering_in_D3DXMESHOPT_ATTRSORT.diff b/sdk/tools/winesync/d3dx9_staging/0022-d3dx9_36__No_need_to_fail_if_we_don_t_support_vertices_reordering_in_D3DXMESHOPT_ATTRSORT.diff new file mode 100644 index 00000000000..ce6243813ef --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0022-d3dx9_36__No_need_to_fail_if_we_don_t_support_vertices_reordering_in_D3DXMESHOPT_ATTRSORT.diff @@ -0,0 +1,16 @@ +diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c +index 898a88c..b1d9f68 100644 +--- a/dll/directx/wine/d3dx9_36/mesh.c ++++ b/dll/directx/wine/d3dx9_36/mesh.c +@@ -1695,11 +1695,7 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, + if (FAILED(hr)) goto cleanup; + } else if (flags & D3DXMESHOPT_ATTRSORT) { + if (!(flags & D3DXMESHOPT_IGNOREVERTS)) +- { + FIXME("D3DXMESHOPT_ATTRSORT vertex reordering not implemented.\n"); +- hr = E_NOTIMPL; +- goto cleanup; +- } + + hr = iface->lpVtbl->LockAttributeBuffer(iface, 0, &attrib_buffer); + if (FAILED(hr)) goto cleanup;

4 years, 10 months

[reactos] 37/74: [WINESYNC]d3dx9_36: Filter out D3DCompile warning messages that are not present with D3DCompileShader. (try 4)

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6c4f5e79cf47274f43ab… commit f6c4f5e79cf47274f43ab685565ae9dd10b6b300 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Filter out D3DCompile warning messages that are not present with D3DCompileShader. (try 4) This patch fixes vertex processing issue of bug 33770. The problem comes from the fact that even if the call succeeds, the game interprets a non null error_messages pointer as an error. By calling D3DCompile we use a newer version of the compiler which is more strict and generates the following warning. - warning X3206: 'dot': implicit truncation of vector type - warning X3206: implicit truncation of vector type - warning X3206: 'mul': implicit truncation of vector type D3DCompileShader does not generate such warnings. These is confirmed in the DX SDK release note: New Warning X3206: Implicit Truncation of Vector Type Beginning in the August 2009 release of the DirectX SDK, the compiler will warn when an implicit truncation of a vector type occurs. The warnings cannot be disable so this patch filters out these strings in D3DCompileShader and reset the error messages pointer if the resulting buffer is empty. Try 2: - only filter out lines containing "X3206:" in case d3dcompiler_43 has localization Try 3: - use move in place instead of copying the buffer Try 4: - filter simplification by Sebastian and remove 'mul' testing left-out in search string wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/shader.c | 35 ++++++++++++++++ ...not_present_with_D3DCompileShader._(try_4).diff | 46 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dll/directx/wine/d3dx9_36/shader.c b/dll/directx/wine/d3dx9_36/shader.c index 7a23867ba31..fc0f503c697 100644 --- a/dll/directx/wine/d3dx9_36/shader.c +++ b/dll/directx/wine/d3dx9_36/shader.c @@ -441,6 +441,41 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO } } + /* Filter out D3DCompile warning messages that are not present with D3DCompileShader */ + if (SUCCEEDED(hr) && error_msgs && *error_msgs) + { + char *messages = ID3DXBuffer_GetBufferPointer(*error_msgs); + DWORD size = ID3DXBuffer_GetBufferSize(*error_msgs); + + /* Ensure messages are null terminated for safe processing */ + if (size) messages[size - 1] = 0; + + while (size > 1) + { + char *prev, *next; + + /* Warning has the form "warning X3206: ... implicit truncation of vector type" + but we only search for "X3206:" in case d3dcompiler_43 has localization */ + prev = next = strstr(messages, "X3206:"); + if (!prev) break; + + /* get pointer to beginning and end of current line */ + while (prev > messages && *(prev - 1) != '\n') prev--; + while (next < messages + size - 1 && *next != '\n') next++; + if (next < messages + size - 1 && *next == '\n') next++; + + memmove(prev, next, messages + size - next); + size -= (next - prev); + } + + /* Only return a buffer if the resulting string is not empty as some apps depend on that */ + if (size <= 1) + { + ID3DXBuffer_Release(*error_msgs); + *error_msgs = NULL; + } + } + return hr; } diff --git a/sdk/tools/winesync/d3dx9_staging/0021-d3dx9_36__Filter_out_D3DCompile_warning_messages_that_are_not_present_with_D3DCompileShader._(try_4).diff b/sdk/tools/winesync/d3dx9_staging/0021-d3dx9_36__Filter_out_D3DCompile_warning_messages_that_are_not_present_with_D3DCompileShader._(try_4).diff new file mode 100644 index 00000000000..aba59a121ad --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0021-d3dx9_36__Filter_out_D3DCompile_warning_messages_that_are_not_present_with_D3DCompileShader._(try_4).diff @@ -0,0 +1,46 @@ +diff --git a/dll/directx/wine/d3dx9_36/shader.c b/dll/directx/wine/d3dx9_36/shader.c +index 7a23867..fc0f503 100644 +--- a/dll/directx/wine/d3dx9_36/shader.c ++++ b/dll/directx/wine/d3dx9_36/shader.c +@@ -441,6 +441,41 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO + } + } + ++ /* Filter out D3DCompile warning messages that are not present with D3DCompileShader */ ++ if (SUCCEEDED(hr) && error_msgs && *error_msgs) ++ { ++ char *messages = ID3DXBuffer_GetBufferPointer(*error_msgs); ++ DWORD size = ID3DXBuffer_GetBufferSize(*error_msgs); ++ ++ /* Ensure messages are null terminated for safe processing */ ++ if (size) messages[size - 1] = 0; ++ ++ while (size > 1) ++ { ++ char *prev, *next; ++ ++ /* Warning has the form "warning X3206: ... implicit truncation of vector type" ++ but we only search for "X3206:" in case d3dcompiler_43 has localization */ ++ prev = next = strstr(messages, "X3206:"); ++ if (!prev) break; ++ ++ /* get pointer to beginning and end of current line */ ++ while (prev > messages && *(prev - 1) != '\n') prev--; ++ while (next < messages + size - 1 && *next != '\n') next++; ++ if (next < messages + size - 1 && *next == '\n') next++; ++ ++ memmove(prev, next, messages + size - next); ++ size -= (next - prev); ++ } ++ ++ /* Only return a buffer if the resulting string is not empty as some apps depend on that */ ++ if (size <= 1) ++ { ++ ID3DXBuffer_Release(*error_msgs); ++ *error_msgs = NULL; ++ } ++ } ++ + return hr; + } +

4 years, 10 months

[reactos] 36/74: [WINESYNC]d3dx9_36/tests: Add initial tests for dummy skininfo interface.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4faa6f9822663581b0be1… commit 4faa6f9822663581b0be1d497351babfeb4edb2a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36/tests: Add initial tests for dummy skininfo interface. wine-staging patch by Michael Müller <michael(a)fds-team.de> --- modules/rostests/winetests/d3dx9_36/mesh.c | 127 +++++++++++++++++ ...initial_tests_for_dummy_skininfo_interface.diff | 152 +++++++++++++++++++++ 2 files changed, 279 insertions(+) diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index 176f06c56cd..35dd6c4c3b0 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -25,6 +25,9 @@ #include <limits.h> #include "wine/test.h" #include "d3dx9.h" +#include "initguid.h" +#include "rmxftmpl.h" +#include "rmxfguid.h" #ifndef NAN /* From wine/port.h */ @@ -2544,6 +2547,129 @@ static void D3DXLoadMeshTest(void) free_test_context(test_context); } +static ID3DXFileData *get_mesh_data(const char *memory, SIZE_T length) +{ + D3DXF_FILELOADMEMORY source; + ID3DXFileEnumObject *enumobj = NULL; + ID3DXFileData *filedata = NULL; + ID3DXFileData *ret = NULL; + ID3DXFile *d3dxfile = NULL; + SIZE_T i, nb_children; + HRESULT hr; + GUID guid; + + hr = D3DXFileCreate(&d3dxfile); + if (FAILED(hr)) return NULL; + + hr = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); + if (FAILED(hr)) goto cleanup; + + source.lpMemory = (void *)memory; + source.dSize = length; + + hr = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &source, D3DXF_FILELOAD_FROMMEMORY, &enumobj); + if (FAILED(hr)) goto cleanup; + + hr = enumobj->lpVtbl->GetChildren(enumobj, &nb_children); + if (FAILED(hr)) goto cleanup; + + for (i = 0; i < nb_children; i++) + { + hr = enumobj->lpVtbl->GetChild(enumobj, i, &filedata); + if (FAILED(hr)) goto cleanup; + + hr = filedata->lpVtbl->GetType(filedata, &guid); + if (SUCCEEDED(hr) && IsEqualGUID(&guid, &TID_D3DRMMesh)) + { + ret = filedata; + break; + } + else + filedata->lpVtbl->Release(filedata); + } + +cleanup: + if (enumobj) enumobj->lpVtbl->Release(enumobj); + if (d3dxfile) d3dxfile->lpVtbl->Release(d3dxfile); + + return ret; +} + +static void D3DXLoadSkinMeshFromXofTest(void) +{ + static const char simple_xfile[] = + "xof 0303txt 0032" + "Mesh {" + "3;" + "0.0; 0.0; 0.0;," + "0.0; 1.0; 0.0;," + "1.0; 1.0; 0.0;;" + "1;" + "3; 0, 1, 2;;" + "}"; + ID3DXBuffer *adjacency, *materials, *effects; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + ID3DXFileData *filedata; + ID3DXSkinInfo *skininfo; + ID3DXMesh *mesh; + IDirect3D9 *d3d; + DWORD mat_count; + HRESULT hr; + HWND hwnd; + + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return; + } + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(hwnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + DestroyWindow(hwnd); + return; + } + + filedata = get_mesh_data(simple_xfile, sizeof(simple_xfile) - 1); + ok(filedata != NULL, "Failed to load mesh data\n"); + + adjacency = materials = effects = NULL; + skininfo = NULL; + mesh = NULL; + + hr = D3DXLoadSkinMeshFromXof(filedata, 0, device, &adjacency, &materials, &effects, &mat_count, &skininfo, &mesh); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(skininfo != NULL, "Expected non-null skininfo\n"); + + /* FIXME: Add additional tests for skininfo interface. */ + + if (adjacency) adjacency->lpVtbl->Release(adjacency); + if (materials) materials->lpVtbl->Release(materials); + if (effects) effects->lpVtbl->Release(effects); + if (skininfo) skininfo->lpVtbl->Release(skininfo); + if (mesh) mesh->lpVtbl->Release(mesh); + + filedata->lpVtbl->Release(filedata); + IDirect3DDevice9_Release(device); + DestroyWindow(hwnd); +} + static BOOL compute_box(struct mesh *mesh, float width, float height, float depth) { unsigned int i, face; @@ -11253,6 +11379,7 @@ START_TEST(mesh) D3DXCreateMeshTest(); D3DXCreateMeshFVFTest(); D3DXLoadMeshTest(); + D3DXLoadSkinMeshFromXofTest(); D3DXCreateBoxTest(); D3DXCreatePolygonTest(); D3DXCreateSphereTest(); diff --git a/sdk/tools/winesync/d3dx9_staging/0020-d3dx9_36_tests__Add_initial_tests_for_dummy_skininfo_interface.diff b/sdk/tools/winesync/d3dx9_staging/0020-d3dx9_36_tests__Add_initial_tests_for_dummy_skininfo_interface.diff new file mode 100644 index 00000000000..ee1e1e9986f --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0020-d3dx9_36_tests__Add_initial_tests_for_dummy_skininfo_interface.diff @@ -0,0 +1,152 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c +index 904a452..ea0b867 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -25,6 +25,9 @@ + #include <limits.h> + #include "wine/test.h" + #include "d3dx9.h" ++#include "initguid.h" ++#include "rmxftmpl.h" ++#include "rmxfguid.h" + + #ifndef NAN + /* From wine/port.h */ +@@ -2544,6 +2547,129 @@ static void D3DXLoadMeshTest(void) + free_test_context(test_context); + } + ++static ID3DXFileData *get_mesh_data(const char *memory, SIZE_T length) ++{ ++ D3DXF_FILELOADMEMORY source; ++ ID3DXFileEnumObject *enumobj = NULL; ++ ID3DXFileData *filedata = NULL; ++ ID3DXFileData *ret = NULL; ++ ID3DXFile *d3dxfile = NULL; ++ SIZE_T i, nb_children; ++ HRESULT hr; ++ GUID guid; ++ ++ hr = D3DXFileCreate(&d3dxfile); ++ if (FAILED(hr)) return NULL; ++ ++ hr = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); ++ if (FAILED(hr)) goto cleanup; ++ ++ source.lpMemory = (void *)memory; ++ source.dSize = length; ++ ++ hr = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &source, D3DXF_FILELOAD_FROMMEMORY, &enumobj); ++ if (FAILED(hr)) goto cleanup; ++ ++ hr = enumobj->lpVtbl->GetChildren(enumobj, &nb_children); ++ if (FAILED(hr)) goto cleanup; ++ ++ for (i = 0; i < nb_children; i++) ++ { ++ hr = enumobj->lpVtbl->GetChild(enumobj, i, &filedata); ++ if (FAILED(hr)) goto cleanup; ++ ++ hr = filedata->lpVtbl->GetType(filedata, &guid); ++ if (SUCCEEDED(hr) && IsEqualGUID(&guid, &TID_D3DRMMesh)) ++ { ++ ret = filedata; ++ break; ++ } ++ else ++ filedata->lpVtbl->Release(filedata); ++ } ++ ++cleanup: ++ if (enumobj) enumobj->lpVtbl->Release(enumobj); ++ if (d3dxfile) d3dxfile->lpVtbl->Release(d3dxfile); ++ ++ return ret; ++} ++ ++static void D3DXLoadSkinMeshFromXofTest(void) ++{ ++ static const char simple_xfile[] = ++ "xof 0303txt 0032" ++ "Mesh {" ++ "3;" ++ "0.0; 0.0; 0.0;," ++ "0.0; 1.0; 0.0;," ++ "1.0; 1.0; 0.0;;" ++ "1;" ++ "3; 0, 1, 2;;" ++ "}"; ++ ID3DXBuffer *adjacency, *materials, *effects; ++ D3DPRESENT_PARAMETERS d3dpp; ++ IDirect3DDevice9 *device; ++ ID3DXFileData *filedata; ++ ID3DXSkinInfo *skininfo; ++ ID3DXMesh *mesh; ++ IDirect3D9 *d3d; ++ DWORD mat_count; ++ HRESULT hr; ++ HWND hwnd; ++ ++ if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, ++ 640, 480, NULL, NULL, NULL, NULL))) ++ { ++ skip("Couldn't create application window\n"); ++ return; ++ } ++ ++ d3d = Direct3DCreate9(D3D_SDK_VERSION); ++ if (!d3d) ++ { ++ skip("Couldn't create IDirect3D9 object\n"); ++ DestroyWindow(hwnd); ++ return; ++ } ++ ++ ZeroMemory(&d3dpp, sizeof(d3dpp)); ++ d3dpp.Windowed = TRUE; ++ d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; ++ ++ hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); ++ IDirect3D9_Release(d3d); ++ if (FAILED(hr)) ++ { ++ skip("Failed to create IDirect3DDevice9 object %#x\n", hr); ++ DestroyWindow(hwnd); ++ return; ++ } ++ ++ filedata = get_mesh_data(simple_xfile, sizeof(simple_xfile) - 1); ++ ok(filedata != NULL, "Failed to load mesh data\n"); ++ ++ adjacency = materials = effects = NULL; ++ skininfo = NULL; ++ mesh = NULL; ++ ++ hr = D3DXLoadSkinMeshFromXof(filedata, 0, device, &adjacency, &materials, &effects, &mat_count, &skininfo, &mesh); ++ ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); ++ ok(skininfo != NULL, "Expected non-null skininfo\n"); ++ ++ /* FIXME: Add additional tests for skininfo interface. */ ++ ++ if (adjacency) adjacency->lpVtbl->Release(adjacency); ++ if (materials) materials->lpVtbl->Release(materials); ++ if (effects) effects->lpVtbl->Release(effects); ++ if (skininfo) skininfo->lpVtbl->Release(skininfo); ++ if (mesh) mesh->lpVtbl->Release(mesh); ++ ++ filedata->lpVtbl->Release(filedata); ++ IDirect3DDevice9_Release(device); ++ DestroyWindow(hwnd); ++} ++ + static BOOL compute_box(struct mesh *mesh, float width, float height, float depth) + { + unsigned int i, face; +@@ -11222,6 +11348,7 @@ START_TEST(mesh) + D3DXCreateMeshTest(); + D3DXCreateMeshFVFTest(); + D3DXLoadMeshTest(); ++ D3DXLoadSkinMeshFromXofTest(); + D3DXCreateBoxTest(); + D3DXCreatePolygonTest(); + D3DXCreateSphereTest();

4 years, 10 months

[reactos] 35/74: [WINESYNC]d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof when skin information is unavailable.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8931e12659e83260ba028… commit 8931e12659e83260ba028d617eeedb47160dd145 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof when skin information is unavailable. wine-staging patch by Michael Müller <michael(a)fds-team.de> --- dll/directx/wine/d3dx9_36/d3dx9_private.h | 2 + dll/directx/wine/d3dx9_36/mesh.c | 7 +++ dll/directx/wine/d3dx9_36/skin.c | 22 +++++++- ...omXof_when_skin_information_is_unavailable.diff | 66 ++++++++++++++++++++++ 4 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h b/dll/directx/wine/d3dx9_36/d3dx9_private.h index 5fc7f506760..4f0899f82f1 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_private.h +++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h @@ -410,4 +410,6 @@ struct ctab_constant { const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface, D3DXHANDLE constant) DECLSPEC_HIDDEN; +HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN; + #endif /* __WINE_D3DX9_PRIVATE_H */ diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index 2a9ee0627c0..898a88c1131 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -3332,6 +3332,13 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, goto end; } + if ((provide_flags & PROVIDE_SKININFO) && !mesh_data->skin_info) + { + hr = create_dummy_skin(&mesh_data->skin_info); + if (FAILED(hr)) + goto end; + } + hr = D3D_OK; end: diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c index f197d33582a..bed4b9f49d2 100644 --- a/dll/directx/wine/d3dx9_36/skin.c +++ b/dll/directx/wine/d3dx9_36/skin.c @@ -94,7 +94,7 @@ static ULONG WINAPI d3dx9_skin_info_Release(ID3DXSkinInfo *iface) HeapFree(GetProcessHeap(), 0, skin->bones[i].vertices); HeapFree(GetProcessHeap(), 0, skin->bones[i].weights); } - HeapFree(GetProcessHeap(), 0, skin->bones); + if (skin->bones) HeapFree(GetProcessHeap(), 0, skin->bones); HeapFree(GetProcessHeap(), 0, skin); } @@ -495,3 +495,23 @@ HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bo return D3DXCreateSkinInfo(num_vertices, declaration, num_bones, skin_info); } + +HRESULT create_dummy_skin(ID3DXSkinInfo **iface) +{ + static const D3DVERTEXELEMENT9 empty_declaration = D3DDECL_END(); + struct d3dx9_skin_info *object = NULL; + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) return E_OUTOFMEMORY; + + object->ID3DXSkinInfo_iface.lpVtbl = &d3dx9_skin_info_vtbl; + object->ref = 1; + object->num_vertices = 0; + object->num_bones = 0; + object->vertex_declaration[0] = empty_declaration; + object->fvf = 0; + object->bones = NULL; + + *iface = &object->ID3DXSkinInfo_iface; + return D3D_OK; +} diff --git a/sdk/tools/winesync/d3dx9_staging/0019-d3dx9_36__Return_dummy_skininfo_interface_in_D3DXLoadSkinMeshFromXof_when_skin_information_is_unavailable.diff b/sdk/tools/winesync/d3dx9_staging/0019-d3dx9_36__Return_dummy_skininfo_interface_in_D3DXLoadSkinMeshFromXof_when_skin_information_is_unavailable.diff new file mode 100644 index 00000000000..89f8bcaf7bd --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0019-d3dx9_36__Return_dummy_skininfo_interface_in_D3DXLoadSkinMeshFromXof_when_skin_information_is_unavailable.diff @@ -0,0 +1,66 @@ +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h b/dll/directx/wine/d3dx9_36/d3dx9_private.h +index 158aae3..7a3d1cb 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_private.h ++++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h +@@ -404,4 +404,6 @@ struct ctab_constant { + const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface, + D3DXHANDLE constant) DECLSPEC_HIDDEN; + ++HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN; ++ + #endif /* __WINE_D3DX9_PRIVATE_H */ +diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c +index 2a9ee06..898a88c 100644 +--- a/dll/directx/wine/d3dx9_36/mesh.c ++++ b/dll/directx/wine/d3dx9_36/mesh.c +@@ -3332,6 +3332,13 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, + goto end; + } + ++ if ((provide_flags & PROVIDE_SKININFO) && !mesh_data->skin_info) ++ { ++ hr = create_dummy_skin(&mesh_data->skin_info); ++ if (FAILED(hr)) ++ goto end; ++ } ++ + hr = D3D_OK; + + end: +diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c +index f197d33..bed4b9f 100644 +--- a/dll/directx/wine/d3dx9_36/skin.c ++++ b/dll/directx/wine/d3dx9_36/skin.c +@@ -94,7 +94,7 @@ static ULONG WINAPI d3dx9_skin_info_Release(ID3DXSkinInfo *iface) + HeapFree(GetProcessHeap(), 0, skin->bones[i].vertices); + HeapFree(GetProcessHeap(), 0, skin->bones[i].weights); + } +- HeapFree(GetProcessHeap(), 0, skin->bones); ++ if (skin->bones) HeapFree(GetProcessHeap(), 0, skin->bones); + HeapFree(GetProcessHeap(), 0, skin); + } + +@@ -495,3 +495,23 @@ HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bo + + return D3DXCreateSkinInfo(num_vertices, declaration, num_bones, skin_info); + } ++ ++HRESULT create_dummy_skin(ID3DXSkinInfo **iface) ++{ ++ static const D3DVERTEXELEMENT9 empty_declaration = D3DDECL_END(); ++ struct d3dx9_skin_info *object = NULL; ++ ++ object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); ++ if (!object) return E_OUTOFMEMORY; ++ ++ object->ID3DXSkinInfo_iface.lpVtbl = &d3dx9_skin_info_vtbl; ++ object->ref = 1; ++ object->num_vertices = 0; ++ object->num_bones = 0; ++ object->vertex_declaration[0] = empty_declaration; ++ object->fvf = 0; ++ object->bones = NULL; ++ ++ *iface = &object->ID3DXSkinInfo_iface; ++ return D3D_OK; ++}

4 years, 10 months

[reactos] 34/74: [WINESYNC]d3dx9_36: ID3DXFont_DrawText calc_rect can be null

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33f33c938722ee90808c3… commit 33f33c938722ee90808c36bf65cec482d5cf2c18 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: ID3DXFont_DrawText calc_rect can be null Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wine-staging patch by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/directx/wine/d3dx9_36/font.c | 8 ++- modules/rostests/winetests/d3dx9_36/core.c | 18 ++++++ ...__ID3DXFont_DrawText_calc_rect_can_be_null.diff | 66 ++++++++++++++++++++++ 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c index 89005ce467c..05e490fd2a5 100644 --- a/dll/directx/wine/d3dx9_36/font.c +++ b/dll/directx/wine/d3dx9_36/font.c @@ -235,7 +235,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) { struct d3dx_font *This = impl_from_ID3DXFont(iface); - RECT calc_rect = *rect; + RECT calc_rect; INT height; TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", @@ -251,11 +251,15 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, while (count > 0 && !string[count-1]) count--; + if (rect) + calc_rect = *rect; + height = DrawTextW(This->hdc, string, count, &calc_rect, format | DT_CALCRECT); if (format & DT_CALCRECT) { - *rect = calc_rect; + if (rect) + *rect = calc_rect; return height; } diff --git a/modules/rostests/winetests/d3dx9_36/core.c b/modules/rostests/winetests/d3dx9_36/core.c index 841d07e8228..a5abb79f904 100644 --- a/modules/rostests/winetests/d3dx9_36/core.c +++ b/modules/rostests/winetests/d3dx9_36/core.c @@ -662,6 +662,15 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) height = ID3DXFont_DrawTextA(font, NULL, testA, 2, &rect, 0, 0xFF00FF); ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + height = ID3DXFont_DrawTextA(font, NULL, testA, -1, NULL, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, testA, -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); + if (0) { /* Causes a lockup on windows 7. */ height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF); ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); @@ -679,6 +688,15 @@ if (0) { /* Causes a lockup on windows 7. */ height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF); ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); + ID3DXFont_Release(font); } } diff --git a/sdk/tools/winesync/d3dx9_staging/0018-d3dx9_36__ID3DXFont_DrawText_calc_rect_can_be_null.diff b/sdk/tools/winesync/d3dx9_staging/0018-d3dx9_36__ID3DXFont_DrawText_calc_rect_can_be_null.diff new file mode 100644 index 00000000000..d8bcb5f1107 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0018-d3dx9_36__ID3DXFont_DrawText_calc_rect_can_be_null.diff @@ -0,0 +1,66 @@ +diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c +index 89005ce..05e490f 100644 +--- a/dll/directx/wine/d3dx9_36/font.c ++++ b/dll/directx/wine/d3dx9_36/font.c +@@ -235,7 +235,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, + const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) + { + struct d3dx_font *This = impl_from_ID3DXFont(iface); +- RECT calc_rect = *rect; ++ RECT calc_rect; + INT height; + + TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", +@@ -251,11 +251,15 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, + while (count > 0 && !string[count-1]) + count--; + ++ if (rect) ++ calc_rect = *rect; ++ + height = DrawTextW(This->hdc, string, count, &calc_rect, format | DT_CALCRECT); + + if (format & DT_CALCRECT) + { +- *rect = calc_rect; ++ if (rect) ++ *rect = calc_rect; + return height; + } + +diff --git a/modules/rostests/winetests/d3dx9_36/core.c b/modules/rostests/winetests/d3dx9_36/core.c +index 841d07e..a5abb79 100644 +--- a/modules/rostests/winetests/d3dx9_36/core.c ++++ b/modules/rostests/winetests/d3dx9_36/core.c +@@ -662,6 +662,15 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) + height = ID3DXFont_DrawTextA(font, NULL, testA, 2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + ++ height = ID3DXFont_DrawTextA(font, NULL, testA, -1, NULL, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextA(font, NULL, testA, -1, NULL, DT_CALCRECT, 0xFF00FF); ++ ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); ++ ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); ++ + if (0) { /* Causes a lockup on windows 7. */ + height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); +@@ -679,6 +688,15 @@ if (0) { /* Causes a lockup on windows 7. */ + height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + ++ height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF); ++ ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); ++ ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); ++ + ID3DXFont_Release(font); + } + }

4 years, 10 months

[reactos] 33/74: [WINESYNC]d3dx9_36: Support NULL terminated strings in ID3DXFont_DrawText

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=219ef2e81fd8f6bc249ff… commit 219ef2e81fd8f6bc249ffd8ff2f168f0130b3ebc Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Support NULL terminated strings in ID3DXFont_DrawText Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wine-staging patch by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/directx/wine/d3dx9_36/font.c | 10 ++- modules/rostests/winetests/d3dx9_36/core.c | 44 ++++++++++ ...L_terminated_strings_in_ID3DXFont_DrawText.diff | 94 ++++++++++++++++++++++ 3 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c index e8689bb864f..89005ce467c 100644 --- a/dll/directx/wine/d3dx9_36/font.c +++ b/dll/directx/wine/d3dx9_36/font.c @@ -213,9 +213,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", iface, sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color); - if (!string || count <= 0) + if (!string || count == 0) return 0; + if (count < 0) + count = -1; + countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0); stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); if (stringW) @@ -238,9 +241,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", iface, sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color); - if (!string || count <= 0) + if (!string || count == 0) return 0; + if (count < 0) + count = lstrlenW(string); + /* Strip terminating NULL characters */ while (count > 0 && !string[count-1]) count--; diff --git a/modules/rostests/winetests/d3dx9_36/core.c b/modules/rostests/winetests/d3dx9_36/core.c index fa874a5ef51..841d07e8228 100644 --- a/modules/rostests/winetests/d3dx9_36/core.c +++ b/modules/rostests/winetests/d3dx9_36/core.c @@ -306,6 +306,7 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) static void test_ID3DXFont(IDirect3DDevice9 *device) { static const WCHAR testW[] = {'t','e','s','t',0}; + static const char testA[] = "test"; static const struct { int font_height; @@ -637,6 +638,49 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ID3DXFont_Release(font); } + + /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */ + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + if (SUCCEEDED(hr)) { + RECT rect; + int height; + + SetRect(&rect, 10, 10, 200, 200); + + height = ID3DXFont_DrawTextA(font, NULL, testA, -2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, testA, -1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, testA, 0, &rect, 0, 0xFF00FF); + ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, testA, 1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, testA, 2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + +if (0) { /* Causes a lockup on windows 7. */ + height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); +} + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF); + ok(height == 0, "DrawTextW returned %d, expected 0.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + ID3DXFont_Release(font); + } } static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) diff --git a/sdk/tools/winesync/d3dx9_staging/0017-d3dx9_36__Support_NULL_terminated_strings_in_ID3DXFont_DrawText.diff b/sdk/tools/winesync/d3dx9_staging/0017-d3dx9_36__Support_NULL_terminated_strings_in_ID3DXFont_DrawText.diff new file mode 100644 index 00000000000..b59911e9a8d --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0017-d3dx9_36__Support_NULL_terminated_strings_in_ID3DXFont_DrawText.diff @@ -0,0 +1,94 @@ +diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c +index e8689bb..89005ce 100644 +--- a/dll/directx/wine/d3dx9_36/font.c ++++ b/dll/directx/wine/d3dx9_36/font.c +@@ -213,9 +213,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, + TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", + iface, sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color); + +- if (!string || count <= 0) ++ if (!string || count == 0) + return 0; + ++ if (count < 0) ++ count = -1; ++ + countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0); + stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); + if (stringW) +@@ -238,9 +241,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, + TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", + iface, sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color); + +- if (!string || count <= 0) ++ if (!string || count == 0) + return 0; + ++ if (count < 0) ++ count = lstrlenW(string); ++ + /* Strip terminating NULL characters */ + while (count > 0 && !string[count-1]) + count--; +diff --git a/modules/rostests/winetests/d3dx9_36/core.c b/modules/rostests/winetests/d3dx9_36/core.c +index fa874a5..841d07e 100644 +--- a/modules/rostests/winetests/d3dx9_36/core.c ++++ b/modules/rostests/winetests/d3dx9_36/core.c +@@ -306,6 +306,7 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) + static void test_ID3DXFont(IDirect3DDevice9 *device) + { + static const WCHAR testW[] = {'t','e','s','t',0}; ++ static const char testA[] = "test"; + static const struct + { + int font_height; +@@ -637,6 +638,49 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) + + ID3DXFont_Release(font); + } ++ ++ /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */ ++ hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); ++ if (SUCCEEDED(hr)) { ++ RECT rect; ++ int height; ++ ++ SetRect(&rect, 10, 10, 200, 200); ++ ++ height = ID3DXFont_DrawTextA(font, NULL, testA, -2, &rect, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextA(font, NULL, testA, -1, &rect, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextA(font, NULL, testA, 0, &rect, 0, 0xFF00FF); ++ ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); ++ ++ height = ID3DXFont_DrawTextA(font, NULL, testA, 1, &rect, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextA(font, NULL, testA, 2, &rect, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); ++ ++if (0) { /* Causes a lockup on windows 7. */ ++ height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); ++} ++ ++ height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF); ++ ok(height == 0, "DrawTextW returned %d, expected 0.\n", height); ++ ++ height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); ++ ++ height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF); ++ ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); ++ ++ ID3DXFont_Release(font); ++ } + } + + static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)

4 years, 10 months

[reactos] 32/74: [WINESYNC]d3dx9_36: Fix horizontal centering in ID3DXFont_DrawText.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54240ccee0282eed81395… commit 54240ccee0282eed81395748c498adfd19081033 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Fix horizontal centering in ID3DXFont_DrawText. Fix remaining text issues in Air Strike. Should fix text placement in Stronghold Kingdoms. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/font.c | 7 +++++++ ...Fix_horizontal_centering_in_ID3DXFont_DrawText.diff | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c index 2e2f6964c45..e8689bb864f 100644 --- a/dll/directx/wine/d3dx9_36/font.c +++ b/dll/directx/wine/d3dx9_36/font.c @@ -253,6 +253,13 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, return height; } + if (format & DT_CENTER) + { + UINT new_width = calc_rect.right - calc_rect.left; + calc_rect.left = (rect->right + rect->left - new_width) / 2; + calc_rect.right = calc_rect.left + new_width; + } + if (height && (calc_rect.left < calc_rect.right)) { D3DLOCKED_RECT locked_rect; diff --git a/sdk/tools/winesync/d3dx9_staging/0016-d3dx9_36__Fix_horizontal_centering_in_ID3DXFont_DrawText.diff b/sdk/tools/winesync/d3dx9_staging/0016-d3dx9_36__Fix_horizontal_centering_in_ID3DXFont_DrawText.diff new file mode 100644 index 00000000000..4f34de4c6e6 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0016-d3dx9_36__Fix_horizontal_centering_in_ID3DXFont_DrawText.diff @@ -0,0 +1,18 @@ +diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c +index 2e2f696..e8689bb 100644 +--- a/dll/directx/wine/d3dx9_36/font.c ++++ b/dll/directx/wine/d3dx9_36/font.c +@@ -253,6 +253,13 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, + return height; + } + ++ if (format & DT_CENTER) ++ { ++ UINT new_width = calc_rect.right - calc_rect.left; ++ calc_rect.left = (rect->right + rect->left - new_width) / 2; ++ calc_rect.right = calc_rect.left + new_width; ++ } ++ + if (height && (calc_rect.left < calc_rect.right)) + { + D3DLOCKED_RECT locked_rect;

4 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2020