February 2009 - Wine-Commits

Alexandre Julliard : widl: Add printf format attribute on all printf-like functions and fix resulting warnings .
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: fcc096083fe9527cd4638f85533e4488a4aef343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc096083fe9527cd4638f855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 14:31:29 2009 +0100 widl: Add printf format attribute on all printf-like functions and fix resulting warnings. --- tools/widl/client.c | 5 +++-- tools/widl/header.h | 4 ++-- tools/widl/proxy.c | 10 +++++----- tools/widl/server.c | 11 +++++------ tools/widl/typegen.c | 43 +++++++++++++++++++++---------------------- 5 files changed, 36 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc096083fe9527cd4638…

1 0

Alexandre Julliard : widl: Replace unsigned long and size_t by unsigned int where appropriate.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: ef6971da4053a1fff4e28a66f0c6a8b121efe061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6971da4053a1fff4e28a66f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 14:30:38 2009 +0100 widl: Replace unsigned long and size_t by unsigned int where appropriate. --- tools/widl/client.c | 2 +- tools/widl/hash.c | 2 +- tools/widl/hash.h | 2 +- tools/widl/header.c | 2 +- tools/widl/parser.y | 4 +- tools/widl/server.c | 6 +- tools/widl/typegen.c | 194 +++++++++++++++++++++++----------------------- tools/widl/typegen.h | 10 +- tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 4 +- tools/widl/widltypes.h | 2 +- tools/widl/write_msft.c | 4 +- 12 files changed, 117 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef6971da4053a1fff4e28…

1 0

Alexandre Julliard : widl: Add a dummy reference to the filter function to avoid a warning.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 844c8a18047a76da43072a88bcfdbe9e7f9f7dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=844c8a18047a76da43072a88b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 14:03:54 2009 +0100 widl: Add a dummy reference to the filter function to avoid a warning. --- tools/widl/typegen.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d16f1fd..beae9aa 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3685,7 +3685,9 @@ void write_exceptions( FILE *file ) fprintf( file, "\n"); fprintf( file, "#else /* USE_COMPILER_EXCEPTIONS */\n"); fprintf( file, "\n"); - fprintf( file, "#define RpcExceptionInit(filter_func,finally_func) do {} while(0)\n"); + fprintf( file, "#define RpcExceptionInit(filter_func,finally_func) \\\n"); + fprintf( file, " do { (void)(filter_func); } while(0)\n"); + fprintf( file, "\n"); fprintf( file, "#define __DECL_EXCEPTION_FRAME \\\n"); fprintf( file, " DWORD code;\n"); fprintf( file, "\n");

1 0

Alexandre Julliard : widl: Avoid using GetExceptionCode outside of an exception handler.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: a0fb6246c0b0134866825414919cc6f6d57bd238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0fb6246c0b01348668254149… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 14:03:29 2009 +0100 widl: Avoid using GetExceptionCode outside of an exception handler. --- tools/widl/server.c | 5 ++++- tools/widl/typegen.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 3b0e2f4..359d2e9 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -392,7 +392,10 @@ static void init_server(void) print_server("\n"); print_server("static int __server_filter( struct __server_frame *__frame )\n"); print_server( "{\n"); - print_server( " return RPC_BAD_STUB_DATA_EXCEPTION_FILTER;\n"); + print_server( " return (__frame->code == STATUS_ACCESS_VIOLATION) ||\n"); + print_server( " (__frame->code == STATUS_DATATYPE_MISALIGNMENT) ||\n"); + print_server( " (__frame->code == RPC_X_BAD_STUB_DATA) ||\n"); + print_server( " (__frame->code == RPC_S_INVALID_BOUND);\n"); print_server( "}\n"); print_server( "\n"); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 599e2fe..d16f1fd 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3686,7 +3686,8 @@ void write_exceptions( FILE *file ) fprintf( file, "#else /* USE_COMPILER_EXCEPTIONS */\n"); fprintf( file, "\n"); fprintf( file, "#define RpcExceptionInit(filter_func,finally_func) do {} while(0)\n"); - fprintf( file, "#define __DECL_EXCEPTION_FRAME\n"); + fprintf( file, "#define __DECL_EXCEPTION_FRAME \\\n"); + fprintf( file, " DWORD code;\n"); fprintf( file, "\n"); fprintf( file, "#endif /* USE_COMPILER_EXCEPTIONS */\n"); }

1 0

David Adam : d3dx8: Implement D3DXComputeBoundingBox.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: f1bb04ff8a421378508302b978bd54b097812f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bb04ff8a421378508302b97… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Feb 6 11:42:01 2009 +0100 d3dx8: Implement D3DXComputeBoundingBox. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/mesh.c | 28 +++++++++++++++++++ dlls/d3dx8/tests/mesh.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ include/d3dx8mesh.h | 1 + 4 files changed, 98 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index ff9ec79..88666f7 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -93,7 +93,7 @@ @ stub D3DXGeneratePMesh @ stub D3DXSimplifyMesh @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) -@ stub D3DXComputeBoundingBox +@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) @ stub D3DXComputeNormals @ stdcall D3DXCreateBuffer(long ptr) @ stub D3DXLoadMeshFromX diff --git a/dlls/d3dx8/mesh.c b/dlls/d3dx8/mesh.c index 43d309f..baa5f20 100644 --- a/dlls/d3dx8/mesh.c +++ b/dlls/d3dx8/mesh.c @@ -97,6 +97,34 @@ done we've got an intersection of the ray with the box. return TRUE; } +HRESULT WINAPI D3DXComputeBoundingBox(PVOID ppointsFVF, DWORD numvertices, DWORD FVF, D3DXVECTOR3 *pmin, D3DXVECTOR3 *pmax) +{ + D3DXVECTOR3 vec; + unsigned int i; + + if( !ppointsFVF || !pmin || !pmax ) return D3DERR_INVALIDCALL; + + *pmin = *(D3DXVECTOR3*)((char*)ppointsFVF); + *pmax = *pmin; + +/* It looks like that D3DXComputeBoundingBox does not take in account the last vertex. */ + for(i=0; i<numvertices-1; i++) + { + vec = *(D3DXVECTOR3*)((char*)ppointsFVF + D3DXGetFVFVertexSize(FVF) * i); + + if ( vec.x < pmin->x ) pmin->x = vec.x; + if ( vec.x > pmax->x ) pmax->x = vec.x; + + if ( vec.y < pmin->y ) pmin->y = vec.y; + if ( vec.y > pmax->y ) pmax->y = vec.y; + + if ( vec.z < pmin->z ) pmin->z = vec.z; + if ( vec.z > pmax->z ) pmax->z = vec.z; + } + + return D3D_OK; +} + HRESULT WINAPI D3DXComputeBoundingSphere(PVOID ppointsFVF, DWORD numvertices, DWORD FVF, D3DXVECTOR3 *pcenter, FLOAT *pradius) { D3DXVECTOR3 temp, temp1; diff --git a/dlls/d3dx8/tests/mesh.c b/dlls/d3dx8/tests/mesh.c index 26d1d21..c16ee15 100644 --- a/dlls/d3dx8/tests/mesh.c +++ b/dlls/d3dx8/tests/mesh.c @@ -111,6 +111,73 @@ static void D3DXBoundProbeTest(void) ok(result == FALSE, "expected FALSE, received TRUE\n"); } +static void D3DXComputeBoundingBoxTest(void) +{ + D3DXVECTOR3 exp_max, exp_min, got_max, got_min, vertex[5]; + HRESULT hr; + + vertex[0].x = 1.0f; vertex[0].y = 1.0f; vertex[0].z = 1.0f; + vertex[1].x = 1.0f; vertex[1].y = 1.0f; vertex[1].z = 1.0f; + vertex[2].x = 1.0f; vertex[2].y = 1.0f; vertex[2].z = 1.0f; + vertex[3].x = 1.0f; vertex[3].y = 1.0f; vertex[3].z = 1.0f; + vertex[4].x = 9.0f; vertex[4].y = 9.0f; vertex[4].z = 9.0f; + + exp_min.x = 1.0f; exp_min.y = 1.0f; exp_min.z = 1.0f; + exp_max.x = 1.0f; exp_max.y = 1.0f; exp_max.z = 1.0f; + + hr = D3DXComputeBoundingBox(&vertex[3],2,D3DFVF_XYZ,&got_min,&got_max); + + ok( hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + ok( compare_vec3(exp_min,got_min), "Expected min: (%f, %f, %f), got: (%f, %f, %f)\n", exp_min.x,exp_min.y,exp_min.z,got_min.x,got_min.y,got_min.z); + ok( compare_vec3(exp_max,got_max), "Expected max: (%f, %f, %f), got: (%f, %f, %f)\n", exp_max.x,exp_max.y,exp_max.z,got_max.x,got_max.y,got_max.z); + +/*________________________*/ + + vertex[0].x = 2.0f; vertex[0].y = 5.9f; vertex[0].z = -1.2f; + vertex[1].x = -1.87f; vertex[1].y = 7.9f; vertex[1].z = 7.4f; + vertex[2].x = 7.43f; vertex[2].y = -0.9f; vertex[2].z = 11.9f; + vertex[3].x = -6.92f; vertex[3].y = 6.3f; vertex[3].z = -3.8f; + vertex[4].x = 11.4f; vertex[4].y = -8.1f; vertex[4].z = 4.5f; + + exp_min.x = -6.92f; exp_min.y = -0.90f; exp_min.z = -3.80f; + exp_max.x = 7.43f; exp_max.y = 7.90f; exp_max.z = 11.9f; + + hr = D3DXComputeBoundingBox(&vertex[0],5,D3DFVF_XYZ,&got_min,&got_max); + + ok( hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + ok( compare_vec3(exp_min,got_min), "Expected min: (%f, %f, %f), got: (%f, %f, %f)\n", exp_min.x,exp_min.y,exp_min.z,got_min.x,got_min.y,got_min.z); + ok( compare_vec3(exp_max,got_max), "Expected max: (%f, %f, %f), got: (%f, %f, %f)\n", exp_max.x,exp_max.y,exp_max.z,got_max.x,got_max.y,got_max.z); + +/*________________________*/ + + vertex[0].x = 2.0f; vertex[0].y = 5.9f; vertex[0].z = -1.2f; + vertex[1].x = -1.87f; vertex[1].y = 7.9f; vertex[1].z = 7.4f; + vertex[2].x = 7.43f; vertex[2].y = -0.9f; vertex[2].z = 11.9f; + vertex[3].x = -6.92f; vertex[3].y = 6.3f; vertex[3].z = -3.8f; + vertex[4].x = 11.4f; vertex[4].y = -8.1f; vertex[4].z = 4.5f; + + exp_min.x = -1.87f; exp_min.y = -0.90f; exp_min.z = -1.20f; + exp_max.x = 7.43f; exp_max.y = 7.90f; exp_max.z = 11.9f; + + hr = D3DXComputeBoundingBox(&vertex[0],4,D3DFVF_XYZ,&got_min,&got_max); + + ok( hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + ok( compare_vec3(exp_min,got_min), "Expected min: (%f, %f, %f), got: (%f, %f, %f)\n", exp_min.x,exp_min.y,exp_min.z,got_min.x,got_min.y,got_min.z); + ok( compare_vec3(exp_max,got_max), "Expected max: (%f, %f, %f), got: (%f, %f, %f)\n", exp_max.x,exp_max.y,exp_max.z,got_max.x,got_max.y,got_max.z); + +/*________________________*/ + hr = D3DXComputeBoundingBox(NULL,5,D3DFVF_XYZ,&got_min,&got_max); + ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + +/*________________________*/ + hr = D3DXComputeBoundingBox(&vertex[3],5,D3DFVF_XYZ,NULL,&got_max); + ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + +/*________________________*/ + hr = D3DXComputeBoundingBox(&vertex[3],5,D3DFVF_XYZ,&got_min,NULL); + ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); +} + static void D3DXComputeBoundingSphereTest(void) { D3DXVECTOR3 exp_cen, got_cen, vertex[5]; @@ -322,6 +389,7 @@ static void D3DXIntersectTriTest(void) START_TEST(mesh) { D3DXBoundProbeTest(); + D3DXComputeBoundingBoxTest(); D3DXComputeBoundingSphereTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); diff --git a/include/d3dx8mesh.h b/include/d3dx8mesh.h index 64c0be5..7f9262d 100644 --- a/include/d3dx8mesh.h +++ b/include/d3dx8mesh.h @@ -31,6 +31,7 @@ UINT WINAPI D3DXGetFVFVertexSize(DWORD); BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *); BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); BOOL CDECL D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, FLOAT *, FLOAT *, FLOAT *); +HRESULT WINAPI D3DXComputeBoundingBox(PVOID, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingSphere(PVOID, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); #ifdef __cplusplus

1 0

David Adam : d3dx8: Implement D3DXComputeBoundingSphere.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 0ccc431a943be027524f27c61a805a0e5712d1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ccc431a943be027524f27c61… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Feb 5 19:06:03 2009 +0100 d3dx8: Implement D3DXComputeBoundingSphere. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/mesh.c | 31 +++++++++++++++++++++++++ dlls/d3dx8/tests/mesh.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ include/d3dx8mesh.h | 1 + 4 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 3ee6f1b..ff9ec79 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -92,7 +92,7 @@ @ stub D3DXValidMesh @ stub D3DXGeneratePMesh @ stub D3DXSimplifyMesh -@ stub D3DXComputeBoundingSphere +@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stub D3DXComputeBoundingBox @ stub D3DXComputeNormals @ stdcall D3DXCreateBuffer(long ptr) diff --git a/dlls/d3dx8/mesh.c b/dlls/d3dx8/mesh.c index 6d6e40f..43d309f 100644 --- a/dlls/d3dx8/mesh.c +++ b/dlls/d3dx8/mesh.c @@ -97,6 +97,37 @@ done we've got an intersection of the ray with the box. return TRUE; } +HRESULT WINAPI D3DXComputeBoundingSphere(PVOID ppointsFVF, DWORD numvertices, DWORD FVF, D3DXVECTOR3 *pcenter, FLOAT *pradius) +{ + D3DXVECTOR3 temp, temp1; + FLOAT d; + unsigned int i; + + if( !ppointsFVF || !pcenter || !pradius ) return D3DERR_INVALIDCALL; + + temp.x = 0.0f; + temp.y = 0.0f; + temp.z = 0.0f; + temp1 = temp; + d = 0.0f; + *pradius = 0.0f; + + for(i=0; i<numvertices; i++) + { + D3DXVec3Add(&temp1, &temp, (D3DXVECTOR3*)((char*)ppointsFVF + D3DXGetFVFVertexSize(FVF) * i)); + temp = temp1; + } + + D3DXVec3Scale(pcenter, &temp, 1.0f/((FLOAT)numvertices)); + + for(i=0; i<numvertices; i++) + { + d = D3DXVec3Length(D3DXVec3Subtract(&temp, (D3DXVECTOR3*)((char*)ppointsFVF + D3DXGetFVFVertexSize(FVF) * i), pcenter)); + if ( d > *pradius ) *pradius = d; + } + return D3D_OK; +} + static UINT Get_TexCoord_Size_From_FVF(DWORD FVF, int tex_num) { return (((((FVF) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1); diff --git a/dlls/d3dx8/tests/mesh.c b/dlls/d3dx8/tests/mesh.c index ed7d154..26d1d21 100644 --- a/dlls/d3dx8/tests/mesh.c +++ b/dlls/d3dx8/tests/mesh.c @@ -32,6 +32,11 @@ static BOOL compare(FLOAT u, FLOAT v) return (fabs(u-v) < admitted_error); } +BOOL compare_vec3(D3DXVECTOR3 u, D3DXVECTOR3 v) +{ + return ( compare(u.x, v.x) && compare(u.y, v.y) && compare(u.z, v.z) ); +} + static void D3DXBoundProbeTest(void) { BOOL result; @@ -106,6 +111,57 @@ static void D3DXBoundProbeTest(void) ok(result == FALSE, "expected FALSE, received TRUE\n"); } +static void D3DXComputeBoundingSphereTest(void) +{ + D3DXVECTOR3 exp_cen, got_cen, vertex[5]; + FLOAT exp_rad, got_rad; + HRESULT hr; + + vertex[0].x = 1.0f; vertex[0].y = 1.0f; vertex[0].z = 1.0f; + vertex[1].x = 1.0f; vertex[1].y = 1.0f; vertex[1].z = 1.0f; + vertex[2].x = 1.0f; vertex[2].y = 1.0f; vertex[2].z = 1.0f; + vertex[3].x = 1.0f; vertex[3].y = 1.0f; vertex[3].z = 1.0f; + vertex[4].x = 9.0f; vertex[4].y = 9.0f; vertex[4].z = 9.0f; + + exp_rad = 6.928203f; + exp_cen.x = 5.0; exp_cen.y = 5.0; exp_cen.z = 5.0; + + hr = D3DXComputeBoundingSphere(&vertex[3],2,D3DFVF_XYZ,&got_cen,&got_rad); + + ok( hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + ok( compare(exp_rad, got_rad), "Expected radius: %f, got radius: %f\n", exp_rad, got_rad); + ok( compare_vec3(exp_cen,got_cen), "Expected center: (%f, %f, %f), got center: (%f, %f, %f)\n", exp_cen.x,exp_cen.y,exp_cen.z,got_cen.x,got_cen.y,got_cen.z); + +/*________________________*/ + + vertex[0].x = 2.0f; vertex[0].y = 5.9f; vertex[0].z = -1.2f; + vertex[1].x = -1.87f; vertex[1].y = 7.9f; vertex[1].z = 7.4f; + vertex[2].x = 7.43f; vertex[2].y = -0.9f; vertex[2].z = 11.9f; + vertex[3].x = -6.92f; vertex[3].y = 6.3f; vertex[3].z = -3.8f; + vertex[4].x = 11.4f; vertex[4].y = -8.1f; vertex[4].z = 4.5f; + + exp_rad = 13.707883f; + exp_cen.x = 2.408f; exp_cen.y = 2.22f; exp_cen.z = 3.76f; + + hr = D3DXComputeBoundingSphere(&vertex[0],5,D3DFVF_XYZ,&got_cen,&got_rad); + + ok( hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + ok( compare(exp_rad, got_rad), "Expected radius: %f, got radius: %f\n", exp_rad, got_rad); + ok( compare_vec3(exp_cen,got_cen), "Expected center: (%f, %f, %f), got center: (%f, %f, %f)\n", exp_cen.x,exp_cen.y,exp_cen.z,got_cen.x,got_cen.y,got_cen.z); + +/*________________________*/ + hr = D3DXComputeBoundingSphere(NULL,5,D3DFVF_XYZ,&got_cen,&got_rad); + ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + +/*________________________*/ + hr = D3DXComputeBoundingSphere(&vertex[3],5,D3DFVF_XYZ,NULL,&got_rad); + ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); + +/*________________________*/ + hr = D3DXComputeBoundingSphere(&vertex[3],5,D3DFVF_XYZ,&got_cen,NULL); + ok( hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); +} + static void D3DXGetFVFVertexSizeTest(void) { UINT got; @@ -266,6 +322,7 @@ static void D3DXIntersectTriTest(void) START_TEST(mesh) { D3DXBoundProbeTest(); + D3DXComputeBoundingSphereTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); } diff --git a/include/d3dx8mesh.h b/include/d3dx8mesh.h index 8cdb166..64c0be5 100644 --- a/include/d3dx8mesh.h +++ b/include/d3dx8mesh.h @@ -31,6 +31,7 @@ UINT WINAPI D3DXGetFVFVertexSize(DWORD); BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *); BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); BOOL CDECL D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, FLOAT *, FLOAT *, FLOAT *); +HRESULT WINAPI D3DXComputeBoundingSphere(PVOID, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); #ifdef __cplusplus }

1 0

David Adam : d3dx8: Change the debug channel into the generic d3dx.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: cdf61610f37f84be4a6b59f4e5b6a8035b015da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf61610f37f84be4a6b59f4e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Feb 5 18:55:31 2009 +0100 d3dx8: Change the debug channel into the generic d3dx. --- dlls/d3dx8/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 4c0bdc7..54f5afb 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -28,7 +28,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx8); +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl;

1 0

David Adam : d3dx8: Implement D3DXGetFVFVertexSize.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 496bc4d1b48d2bb61f0505ed5a4b84f736167284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=496bc4d1b48d2bb61f0505ed5… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Feb 5 18:56:47 2009 +0100 d3dx8: Implement D3DXGetFVFVertexSize. --- dlls/d3dx8/mesh.c | 33 +++++++++++++++++++++++++++++++-- dlls/d3dx9_36/d3dx9_36.spec | 2 +- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/mesh.c b/dlls/d3dx8/mesh.c index 456bad2..6d6e40f 100644 --- a/dlls/d3dx8/mesh.c +++ b/dlls/d3dx8/mesh.c @@ -97,10 +97,39 @@ done we've got an intersection of the ray with the box. return TRUE; } +static UINT Get_TexCoord_Size_From_FVF(DWORD FVF, int tex_num) +{ + return (((((FVF) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1); +} + UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF) { - FIXME("(void): stub\n"); - return 0; + DWORD size = 0; + UINT i; + UINT numTextures = (FVF & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT; + + if (FVF & D3DFVF_NORMAL) size += sizeof(D3DXVECTOR3); + if (FVF & D3DFVF_DIFFUSE) size += sizeof(DWORD); + if (FVF & D3DFVF_SPECULAR) size += sizeof(DWORD); + if (FVF & D3DFVF_PSIZE) size += sizeof(DWORD); + + switch (FVF & D3DFVF_POSITION_MASK) + { + case D3DFVF_XYZ: size += sizeof(D3DXVECTOR3); break; + case D3DFVF_XYZRHW: size += 4 * sizeof(FLOAT); break; + case D3DFVF_XYZB1: size += 4 * sizeof(FLOAT); break; + case D3DFVF_XYZB2: size += 5 * sizeof(FLOAT); break; + case D3DFVF_XYZB3: size += 6 * sizeof(FLOAT); break; + case D3DFVF_XYZB4: size += 7 * sizeof(FLOAT); break; + case D3DFVF_XYZB5: size += 8 * sizeof(FLOAT); break; + } + + for (i = 0; i < numTextures; i++) + { + size += Get_TexCoord_Size_From_FVF(FVF, i) * sizeof(FLOAT); + } + + return size; } BOOL CDECL D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST D3DXVECTOR3 *p2, CONST D3DXVECTOR3 *praypos, CONST D3DXVECTOR3 *praydir, FLOAT *pu, FLOAT *pv, FLOAT *pdist) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 813a5ad..64ebd58 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -150,7 +150,7 @@ @ stub D3DXGetDeclLength @ stub D3DXGetDeclVertexSize @ stdcall D3DXGetDriverLevel(ptr) -@ stdcall D3DXGetFVFVertexSize(long) d3dx8.D3DXGetFVFVertexSize +@ stub D3DXGetFVFVertexSize @ stdcall D3DXGetImageInfoFromFileA(ptr ptr) d3dx8.D3DXGetImageInfoFromFileA @ stdcall D3DXGetImageInfoFromFileInMemory(ptr long ptr) d3dx8.D3DXGetImageInfoFromFileInMemory @ stdcall D3DXGetImageInfoFromFileW(ptr ptr) d3dx8.D3DXGetImageInfoFromFileW

1 0

Luis C. Busquets Pérez : d3dx8: Add tests for D3DXGetFVFVertexSize.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 1d3889fa6fabe9d6a42acf755b5dfae5a0c4c772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3889fa6fabe9d6a42acf755… Author: Luis C. Busquets Pérez <luiscar2001(a)yahoo.es> Date: Thu Feb 5 19:00:32 2009 +0100 d3dx8: Add tests for D3DXGetFVFVertexSize. --- dlls/d3dx8/tests/mesh.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/mesh.c b/dlls/d3dx8/tests/mesh.c index 4dfa11f..ed7d154 100644 --- a/dlls/d3dx8/tests/mesh.c +++ b/dlls/d3dx8/tests/mesh.c @@ -1,5 +1,6 @@ /* * Copyright 2008 David Adam + * Copyright 2008 Luis Busquets * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,10 @@ #define admitted_error 0.0001f +#define compare_vertex_sizes(type, exp) \ + got=D3DXGetFVFVertexSize(type); \ + ok(got==exp, "Expected: %d, Got: %d\n", exp, got); + static BOOL compare(FLOAT u, FLOAT v) { return (fabs(u-v) < admitted_error); @@ -101,6 +106,110 @@ static void D3DXBoundProbeTest(void) ok(result == FALSE, "expected FALSE, received TRUE\n"); } +static void D3DXGetFVFVertexSizeTest(void) +{ + UINT got; + + compare_vertex_sizes (D3DFVF_XYZ, 12); + + compare_vertex_sizes (D3DFVF_XYZB3, 24); + + compare_vertex_sizes (D3DFVF_XYZB5, 32); + + compare_vertex_sizes (D3DFVF_XYZ | D3DFVF_NORMAL, 24); + + compare_vertex_sizes (D3DFVF_XYZ | D3DFVF_DIFFUSE, 16); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX1 | + D3DFVF_TEXCOORDSIZE1(0), 16); + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX2 | + D3DFVF_TEXCOORDSIZE1(0) | + D3DFVF_TEXCOORDSIZE1(1), 20); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX1 | + D3DFVF_TEXCOORDSIZE2(0), 20); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX2 | + D3DFVF_TEXCOORDSIZE2(0) | + D3DFVF_TEXCOORDSIZE2(1), 28); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX6 | + D3DFVF_TEXCOORDSIZE2(0) | + D3DFVF_TEXCOORDSIZE2(1) | + D3DFVF_TEXCOORDSIZE2(2) | + D3DFVF_TEXCOORDSIZE2(3) | + D3DFVF_TEXCOORDSIZE2(4) | + D3DFVF_TEXCOORDSIZE2(5), 60); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX8 | + D3DFVF_TEXCOORDSIZE2(0) | + D3DFVF_TEXCOORDSIZE2(1) | + D3DFVF_TEXCOORDSIZE2(2) | + D3DFVF_TEXCOORDSIZE2(3) | + D3DFVF_TEXCOORDSIZE2(4) | + D3DFVF_TEXCOORDSIZE2(5) | + D3DFVF_TEXCOORDSIZE2(6) | + D3DFVF_TEXCOORDSIZE2(7), 76); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX1 | + D3DFVF_TEXCOORDSIZE3(0), 24); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX4 | + D3DFVF_TEXCOORDSIZE3(0) | + D3DFVF_TEXCOORDSIZE3(1) | + D3DFVF_TEXCOORDSIZE3(2) | + D3DFVF_TEXCOORDSIZE3(3), 60); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX1 | + D3DFVF_TEXCOORDSIZE4(0), 28); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX2 | + D3DFVF_TEXCOORDSIZE4(0) | + D3DFVF_TEXCOORDSIZE4(1), 44); + + compare_vertex_sizes ( + D3DFVF_XYZ | + D3DFVF_TEX3 | + D3DFVF_TEXCOORDSIZE4(0) | + D3DFVF_TEXCOORDSIZE4(1) | + D3DFVF_TEXCOORDSIZE4(2), 60); + + compare_vertex_sizes ( + D3DFVF_XYZB5 | + D3DFVF_NORMAL | + D3DFVF_DIFFUSE | + D3DFVF_SPECULAR | + D3DFVF_TEX8 | + D3DFVF_TEXCOORDSIZE4(0) | + D3DFVF_TEXCOORDSIZE4(1) | + D3DFVF_TEXCOORDSIZE4(2) | + D3DFVF_TEXCOORDSIZE4(3) | + D3DFVF_TEXCOORDSIZE4(4) | + D3DFVF_TEXCOORDSIZE4(5) | + D3DFVF_TEXCOORDSIZE4(6) | + D3DFVF_TEXCOORDSIZE4(7), 180); +} + static void D3DXIntersectTriTest(void) { BOOL exp_res, got_res; @@ -157,5 +266,6 @@ static void D3DXIntersectTriTest(void) START_TEST(mesh) { D3DXBoundProbeTest(); + D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); }

1 0

David Adam : d3dx8: Remove useless includes.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 952d10a67f2268e4be4a008a3fc1d0a18415247b URL: http://source.winehq.org/git/wine.git/?a=commit;h=952d10a67f2268e4be4a008a3… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Feb 5 18:53:09 2009 +0100 d3dx8: Remove useless includes. --- dlls/d3dx8/math.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index b355c9c..4c0bdc7 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -17,10 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <stdlib.h> #include <stdarg.h> -#include <assert.h> #define NONAMELESSUNION

1 0