Henri Verbeet : d3dx9_36: Fix the D3DXFVFFromDeclarator() prototype.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ed9403c74abd403b992a4a605f06b719a1a50ed
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5ed9403c74abd403b992a4a605...

Author: Henri Verbeet 
Date:   Wed Aug 25 20:46:52 2010 +0200

d3dx9_36: Fix the D3DXFVFFromDeclarator() prototype.

The current version matches MSDN, but not the actual SDK header.

---

dlls/d3dx9_36/mesh.c       |    2 +-
 dlls/d3dx9_36/tests/mesh.c |    2 +-
 include/d3dx9mesh.h        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 788c449..cc22107 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -203,7 +203,7 @@ HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 Declaration[MA
 /*************************************************************************
  * D3DXFVFFromDeclarator
  */
-HRESULT WINAPI D3DXFVFFromDeclarator(const LPD3DVERTEXELEMENT9 *declaration, DWORD *fvf)
+HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *declaration, DWORD *fvf)
 {
     FIXME("(%p, %p): stub\n", declaration, fvf);

diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
index 8d0f227..4cdd56b 100644
--- a/dlls/d3dx9_36/tests/mesh.c
+++ b/dlls/d3dx9_36/tests/mesh.c
@@ -491,7 +491,7 @@ static void test_decl_to_fvf(const D3DVERTEXELEMENT9 test_decl[], DWORD expected

copy_elements(decl, test_decl);

-    hr = D3DXFVFFromDeclarator((D3DVERTEXELEMENT9 **)&decl, &result_fvf);
+    hr = D3DXFVFFromDeclarator(decl, &result_fvf);
     if (todo) todo_wine ok(hr == expected_hr, "D3DXFVFFromDeclarator returned %#x, expected %#x, line #%u\n",
                            hr, expected_hr, line);
     else ok(hr == expected_hr, "D3DXFVFFromDeclarator returned %#x, expected %#x, line #%u\n",
diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h
index ff215b7..bc3dd81 100644
--- a/include/d3dx9mesh.h
+++ b/include/d3dx9mesh.h
@@ -159,7 +159,7 @@ BOOL    WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3
 HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *);
 HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *);
 HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]);
-HRESULT WINAPI D3DXFVFFromDeclarator(const LPD3DVERTEXELEMENT9 *, DWORD *);
+HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf);
 BOOL    WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *);

#ifdef __cplusplus