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
8f5543c3
Commit
8f5543c3
authored
Nov 09, 2011
by
Michael Mc Donnell
Committed by
Alexandre Julliard
Nov 15, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Return error if D3DXMESH_VB_SHARE and new declaration.
parent
be8dd2e8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
mesh.c
dlls/d3dx9_36/mesh.c
+4
-1
mesh.c
dlls/d3dx9_36/tests/mesh.c
+3
-3
No files found.
dlls/d3dx9_36/mesh.c
View file @
8f5543c3
...
...
@@ -707,7 +707,10 @@ static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(ID3DXMesh *iface, DWORD options, C
same_declaration
=
declaration_equals
(
declaration
,
orig_declaration
);
if
(
options
&
D3DXMESH_VB_SHARE
)
{
if
(
!
same_declaration
)
goto
error
;
if
(
!
same_declaration
)
{
hr
=
D3DERR_INVALIDCALL
;
goto
error
;
}
IDirect3DVertexBuffer9_AddRef
(
This
->
vertex_buffer
);
/* FIXME: refactor to avoid creating a new vertex buffer */
IDirect3DVertexBuffer9_Release
(
cloned_this
->
vertex_buffer
);
...
...
dlls/d3dx9_36/tests/mesh.c
View file @
8f5543c3
...
...
@@ -9916,9 +9916,9 @@ static void test_clone_mesh(void)
hr
=
mesh
->
lpVtbl
->
CloneMesh
(
mesh
,
tc
[
2
].
create_options
|
D3DXMESH_VB_SHARE
,
tc
[
2
].
new_declaration
,
test_context
->
device
,
&
mesh_clone
);
todo_wine
ok
(
hr
==
D3DERR_INVALIDCALL
,
"CloneMesh D3DXMESH_VB_SHARE with new"
" declaration. Got %x, expected D3DERR_INVALIDCALL
\n
"
,
hr
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"CloneMesh D3DXMESH_VB_SHARE with new"
" declaration. Got %x, expected D3DERR_INVALIDCALL
\n
"
,
hr
);
mesh
->
lpVtbl
->
Release
(
mesh
);
mesh
=
NULL
;
mesh_clone
=
NULL
;
...
...
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