Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b9b9d7cc
Commit
b9b9d7cc
authored
Sep 07, 2010
by
Misha Koshelev
Committed by
Alexandre Julliard
Sep 08, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9_36: Fix the D3DXCreateMesh() prototype.
parent
2752c3bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
mesh.c
dlls/d3dx9_36/mesh.c
+1
-1
mesh.c
dlls/d3dx9_36/tests/mesh.c
+6
-6
d3dx9mesh.h
include/d3dx9mesh.h
+1
-1
No files found.
dlls/d3dx9_36/mesh.c
View file @
b9b9d7cc
...
...
@@ -583,7 +583,7 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST
return
TRUE
;
}
HRESULT
WINAPI
D3DXCreateMesh
(
DWORD
numfaces
,
DWORD
numvertices
,
DWORD
options
,
CONST
LP
D3DVERTEXELEMENT9
*
declaration
,
HRESULT
WINAPI
D3DXCreateMesh
(
DWORD
numfaces
,
DWORD
numvertices
,
DWORD
options
,
CONST
D3DVERTEXELEMENT9
*
declaration
,
LPDIRECT3DDEVICE9
device
,
LPD3DXMESH
*
mesh
)
{
FIXME
(
"(%d, %d, %d, %p, %p, %p): stub
\n
"
,
numfaces
,
numvertices
,
options
,
declaration
,
device
,
mesh
);
...
...
dlls/d3dx9_36/tests/mesh.c
View file @
b9b9d7cc
...
...
@@ -1006,7 +1006,7 @@ static void D3DXCreateMeshTest(void)
hr
=
D3DXCreateMesh
(
0
,
0
,
0
,
NULL
,
NULL
,
NULL
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got result %x, expected %x (D3DERR_INVALIDCALL)
\n
"
,
hr
,
D3DERR_INVALIDCALL
);
hr
=
D3DXCreateMesh
(
1
,
3
,
D3DXMESH_MANAGED
,
(
LPD3DVERTEXELEMENT9
*
)
&
decl
,
NULL
,
&
d3dxmesh
);
hr
=
D3DXCreateMesh
(
1
,
3
,
D3DXMESH_MANAGED
,
decl
,
NULL
,
&
d3dxmesh
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got result %x, expected %x (D3DERR_INVALIDCALL)
\n
"
,
hr
,
D3DERR_INVALIDCALL
);
wnd
=
CreateWindow
(
"static"
,
"d3dx9_test"
,
0
,
0
,
0
,
0
,
0
,
NULL
,
NULL
,
NULL
,
NULL
);
...
...
@@ -1035,13 +1035,13 @@ static void D3DXCreateMeshTest(void)
return
;
}
hr
=
D3DXCreateMesh
(
0
,
3
,
D3DXMESH_MANAGED
,
(
LPD3DVERTEXELEMENT9
*
)
&
decl
,
device
,
&
d3dxmesh
);
hr
=
D3DXCreateMesh
(
0
,
3
,
D3DXMESH_MANAGED
,
decl
,
device
,
&
d3dxmesh
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got result %x, expected %x (D3DERR_INVALIDCALL)
\n
"
,
hr
,
D3DERR_INVALIDCALL
);
hr
=
D3DXCreateMesh
(
1
,
0
,
D3DXMESH_MANAGED
,
(
LPD3DVERTEXELEMENT9
*
)
&
decl
,
device
,
&
d3dxmesh
);
hr
=
D3DXCreateMesh
(
1
,
0
,
D3DXMESH_MANAGED
,
decl
,
device
,
&
d3dxmesh
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got result %x, expected %x (D3DERR_INVALIDCALL)
\n
"
,
hr
,
D3DERR_INVALIDCALL
);
hr
=
D3DXCreateMesh
(
1
,
3
,
0
,
(
LPD3DVERTEXELEMENT9
*
)
&
decl
,
device
,
&
d3dxmesh
);
hr
=
D3DXCreateMesh
(
1
,
3
,
0
,
decl
,
device
,
&
d3dxmesh
);
todo_wine
ok
(
hr
==
D3D_OK
,
"Got result %x, expected %x (D3D_OK)
\n
"
,
hr
,
D3D_OK
);
if
(
hr
==
D3D_OK
)
...
...
@@ -1052,10 +1052,10 @@ static void D3DXCreateMeshTest(void)
hr
=
D3DXCreateMesh
(
1
,
3
,
D3DXMESH_MANAGED
,
0
,
device
,
&
d3dxmesh
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got result %x, expected %x (D3DERR_INVALIDCALL)
\n
"
,
hr
,
D3DERR_INVALIDCALL
);
hr
=
D3DXCreateMesh
(
1
,
3
,
D3DXMESH_MANAGED
,
(
LPD3DVERTEXELEMENT9
*
)
&
decl
,
device
,
NULL
);
hr
=
D3DXCreateMesh
(
1
,
3
,
D3DXMESH_MANAGED
,
decl
,
device
,
NULL
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got result %x, expected %x (D3DERR_INVALIDCALL)
\n
"
,
hr
,
D3DERR_INVALIDCALL
);
hr
=
D3DXCreateMesh
(
1
,
3
,
D3DXMESH_MANAGED
,
(
LPD3DVERTEXELEMENT9
*
)
&
decl
,
device
,
&
d3dxmesh
);
hr
=
D3DXCreateMesh
(
1
,
3
,
D3DXMESH_MANAGED
,
decl
,
device
,
&
d3dxmesh
);
todo_wine
ok
(
hr
==
D3D_OK
,
"Got result %x, expected 0 (D3D_OK)
\n
"
,
hr
);
if
(
hr
==
D3D_OK
)
...
...
include/d3dx9mesh.h
View file @
b9b9d7cc
...
...
@@ -150,7 +150,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
extern
"C"
{
#endif
HRESULT
WINAPI
D3DXCreateMesh
(
DWORD
,
DWORD
,
DWORD
,
CONST
LP
D3DVERTEXELEMENT9
*
,
LPDIRECT3DDEVICE9
,
LPD3DXMESH
*
);
HRESULT
WINAPI
D3DXCreateMesh
(
DWORD
,
DWORD
,
DWORD
,
CONST
D3DVERTEXELEMENT9
*
,
LPDIRECT3DDEVICE9
,
LPD3DXMESH
*
);
HRESULT
WINAPI
D3DXCreateBuffer
(
DWORD
,
LPD3DXBUFFER
*
);
UINT
WINAPI
D3DXGetDeclVertexSize
(
const
D3DVERTEXELEMENT9
*
decl
,
DWORD
stream_idx
);
UINT
WINAPI
D3DXGetFVFVertexSize
(
DWORD
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment