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
afca5564
Commit
afca5564
authored
Jan 10, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 10, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9/tests: Merge buffer.c into device.c.
parent
52a24e82
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
151 additions
and
192 deletions
+151
-192
Makefile.in
dlls/d3d9/tests/Makefile.in
+0
-1
buffer.c
dlls/d3d9/tests/buffer.c
+0
-190
device.c
dlls/d3d9/tests/device.c
+151
-1
No files found.
dlls/d3d9/tests/Makefile.in
View file @
afca5564
...
...
@@ -2,7 +2,6 @@ TESTDLL = d3d9.dll
IMPORTS
=
user32
C_SRCS
=
\
buffer.c
\
d3d9ex.c
\
device.c
\
query.c
\
...
...
dlls/d3d9/tests/buffer.c
deleted
100644 → 0
View file @
52a24e82
/*
* Copyright (C) 2010 Stefan Dösinger(for CodeWeavers)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define COBJMACROS
#include <d3d9.h>
#include "wine/test.h"
static
HMODULE
d3d9_handle
=
0
;
static
HWND
create_window
(
void
)
{
WNDCLASS
wc
=
{
0
};
wc
.
lpfnWndProc
=
DefWindowProc
;
wc
.
lpszClassName
=
"d3d9_test_wc"
;
RegisterClass
(
&
wc
);
return
CreateWindow
(
"d3d9_test_wc"
,
"d3d9_test"
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
);
}
static
IDirect3DDevice9
*
init_d3d9
(
void
)
{
IDirect3D9
*
(
__stdcall
*
d3d9_create
)(
UINT
SDKVersion
)
=
0
;
IDirect3D9
*
d3d9_ptr
=
0
;
IDirect3DDevice9
*
device_ptr
=
0
;
D3DPRESENT_PARAMETERS
present_parameters
;
HRESULT
hr
;
d3d9_create
=
(
void
*
)
GetProcAddress
(
d3d9_handle
,
"Direct3DCreate9"
);
ok
(
d3d9_create
!=
NULL
,
"Failed to get address of Direct3DCreate9
\n
"
);
if
(
!
d3d9_create
)
return
NULL
;
d3d9_ptr
=
d3d9_create
(
D3D_SDK_VERSION
);
if
(
!
d3d9_ptr
)
{
skip
(
"could not create D3D9
\n
"
);
return
NULL
;
}
ZeroMemory
(
&
present_parameters
,
sizeof
(
present_parameters
));
present_parameters
.
Windowed
=
TRUE
;
present_parameters
.
hDeviceWindow
=
create_window
();
present_parameters
.
SwapEffect
=
D3DSWAPEFFECT_DISCARD
;
hr
=
IDirect3D9_CreateDevice
(
d3d9_ptr
,
D3DADAPTER_DEFAULT
,
D3DDEVTYPE_HAL
,
NULL
,
D3DCREATE_HARDWARE_VERTEXPROCESSING
,
&
present_parameters
,
&
device_ptr
);
if
(
FAILED
(
hr
))
{
skip
(
"could not create device, IDirect3D9_CreateDevice returned 0x%08x
\n
"
,
hr
);
return
NULL
;
}
return
device_ptr
;
}
static
void
lock_flag_test
(
IDirect3DDevice9
*
device
)
{
HRESULT
hr
;
IDirect3DVertexBuffer9
*
buffer
;
unsigned
int
i
;
void
*
data
;
const
struct
{
DWORD
flags
;
const
char
*
debug_string
;
HRESULT
win7_result
;
}
test_data
[]
=
{
{
D3DLOCK_READONLY
,
"D3DLOCK_READONLY"
,
D3D_OK
},
{
D3DLOCK_DISCARD
,
"D3DLOCK_DISCARD"
,
D3D_OK
},
{
D3DLOCK_NOOVERWRITE
,
"D3DLOCK_NOOVERWRITE"
,
D3D_OK
},
{
D3DLOCK_NOOVERWRITE
|
D3DLOCK_DISCARD
,
"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD"
,
D3D_OK
},
{
D3DLOCK_NOOVERWRITE
|
D3DLOCK_READONLY
,
"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY"
,
D3D_OK
},
{
D3DLOCK_READONLY
|
D3DLOCK_DISCARD
,
"D3DLOCK_READONLY | D3DLOCK_DISCARD"
,
D3DERR_INVALIDCALL
},
/* Completely bogous flags aren't an error */
{
0xdeadbeef
,
"0xdeadbeef"
,
D3DERR_INVALIDCALL
},
};
hr
=
IDirect3DDevice9_CreateVertexBuffer
(
device
,
1024
,
D3DUSAGE_DYNAMIC
,
0
,
D3DPOOL_DEFAULT
,
&
buffer
,
NULL
);
ok
(
hr
==
D3D_OK
,
"IDirect3DDevice9_CreateBuffer failed, 0x%08x
\n
"
,
hr
);
for
(
i
=
0
;
i
<
(
sizeof
(
test_data
)
/
sizeof
(
*
test_data
));
i
++
)
{
hr
=
IDirect3DVertexBuffer9_Lock
(
buffer
,
0
,
0
,
&
data
,
test_data
[
i
].
flags
);
/* Windows XP always returns D3D_OK even with flags that don't make sense. Windows 7 returns
* an error. At least one game(Shaiya) depends on the Windows XP result, so mark the Windows 7
* behavior as broken()
*/
ok
(
hr
==
D3D_OK
||
broken
(
hr
==
test_data
[
i
].
win7_result
),
"Lock flags %s returned 0x%08x, expected D3D_OK
\n
"
,
test_data
[
i
].
debug_string
,
hr
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
data
!=
NULL
,
"The data pointer returned by Lock is NULL
\n
"
);
hr
=
IDirect3DVertexBuffer9_Unlock
(
buffer
);
ok
(
hr
==
D3D_OK
,
"IDirect3DVertexBuffer9_Unlock failed, 0x%08x
\n
"
,
hr
);
}
}
IDirect3DVertexBuffer9_Release
(
buffer
);
}
static
inline
const
char
*
debug_d3dpool
(
D3DPOOL
pool
)
{
switch
(
pool
)
{
case
D3DPOOL_DEFAULT
:
return
"D3DPOOL_DEFAULT"
;
case
D3DPOOL_SYSTEMMEM
:
return
"D3DPOOL_SYSTEMMEM"
;
case
D3DPOOL_SCRATCH
:
return
"D3DPOOL_SCRATCH"
;
case
D3DPOOL_MANAGED
:
return
"D3DPOOL_MANAGED"
;
default:
return
"unknown pool"
;
}
}
static
void
test_vertex_buffer_alignment
(
IDirect3DDevice9
*
device
)
{
IDirect3DVertexBuffer9
*
buffer
=
NULL
;
HRESULT
hr
;
D3DPOOL
pools
[]
=
{
D3DPOOL_DEFAULT
,
D3DPOOL_SYSTEMMEM
,
D3DPOOL_SCRATCH
,
D3DPOOL_MANAGED
};
DWORD
sizes
[]
=
{
1
,
4
,
16
,
17
,
32
,
33
,
64
,
65
,
1024
,
1025
,
1048576
,
1048577
};
unsigned
int
i
,
j
;
void
*
data
;
unsigned
int
align
=
16
;
for
(
i
=
0
;
i
<
(
sizeof
(
sizes
)
/
sizeof
(
sizes
[
0
]));
i
++
)
{
for
(
j
=
0
;
j
<
(
sizeof
(
pools
)
/
sizeof
(
pools
[
0
]));
j
++
)
{
hr
=
IDirect3DDevice9_CreateVertexBuffer
(
device
,
sizes
[
i
],
0
,
0
,
pools
[
j
],
&
buffer
,
NULL
);
if
(
pools
[
j
]
==
D3DPOOL_SCRATCH
)
{
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Creating a D3DPOOL_SCRATCH buffer returned (0x%08x)
\n
"
,
hr
);
}
else
{
ok
(
SUCCEEDED
(
hr
),
"IDirect3DDevice9_CreateVertexBuffer failed (0x%08x). Pool = %s, size %d
\n
"
,
hr
,
debug_d3dpool
(
pools
[
j
]),
sizes
[
i
]);
}
if
(
FAILED
(
hr
))
continue
;
hr
=
IDirect3DVertexBuffer9_Lock
(
buffer
,
0
,
0
,
&
data
,
0
);
ok
(
SUCCEEDED
(
hr
),
"IDirect3DVertexBuffer9_Lock failed (0x%08x)
\n
"
,
hr
);
ok
(((
DWORD_PTR
)
data
&
(
align
-
1
))
==
0
,
"Vertex buffer start address is not %u byte aligned(size: %d, pool: %s, data: %p)
\n
"
,
align
,
sizes
[
i
],
debug_d3dpool
(
pools
[
j
]),
data
);
hr
=
IDirect3DVertexBuffer9_Unlock
(
buffer
);
ok
(
SUCCEEDED
(
hr
),
"IDirect3DVertexBuffer9_Unlock failed (0x%08x)
\n
"
,
hr
);
if
(
buffer
)
IDirect3DVertexBuffer9_Release
(
buffer
);
}
}
}
START_TEST
(
buffer
)
{
IDirect3DDevice9
*
device_ptr
;
ULONG
refcount
;
d3d9_handle
=
LoadLibraryA
(
"d3d9.dll"
);
if
(
!
d3d9_handle
)
{
skip
(
"Could not load d3d9.dll
\n
"
);
return
;
}
device_ptr
=
init_d3d9
();
if
(
!
device_ptr
)
return
;
lock_flag_test
(
device_ptr
);
test_vertex_buffer_alignment
(
device_ptr
);
refcount
=
IDirect3DDevice9_Release
(
device_ptr
);
ok
(
!
refcount
,
"Device has %u references left
\n
"
,
refcount
);
}
dlls/d3d9/tests/device.c
View file @
afca5564
/*
* Copyright (C) 2006 Vitaliy Margolen
* Copyright (C) 2006 Chris Robinson
* Copyright
(C) 2006-2007 Stefan Dösinger(For CodeWeavers)
* Copyright
2006-2007, 2010 Stefan Dösinger for CodeWeavers
* Copyright 2006, 2007 Henri Verbeet
* Copyright 2013 Henri Verbeet for CodeWeavers
* Copyright (C) 2008 Rico Schüller
...
...
@@ -3820,6 +3820,154 @@ static void test_volume_resource(void)
DestroyWindow
(
window
);
}
static
void
test_vb_lock_flags
(
void
)
{
static
const
struct
{
DWORD
flags
;
const
char
*
debug_string
;
HRESULT
win7_result
;
}
test_data
[]
=
{
{
D3DLOCK_READONLY
,
"D3DLOCK_READONLY"
,
D3D_OK
},
{
D3DLOCK_DISCARD
,
"D3DLOCK_DISCARD"
,
D3D_OK
},
{
D3DLOCK_NOOVERWRITE
,
"D3DLOCK_NOOVERWRITE"
,
D3D_OK
},
{
D3DLOCK_NOOVERWRITE
|
D3DLOCK_DISCARD
,
"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD"
,
D3D_OK
},
{
D3DLOCK_NOOVERWRITE
|
D3DLOCK_READONLY
,
"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY"
,
D3D_OK
},
{
D3DLOCK_READONLY
|
D3DLOCK_DISCARD
,
"D3DLOCK_READONLY | D3DLOCK_DISCARD"
,
D3DERR_INVALIDCALL
},
/* Completely bogus flags aren't an error. */
{
0xdeadbeef
,
"0xdeadbeef"
,
D3DERR_INVALIDCALL
},
};
IDirect3DVertexBuffer9
*
buffer
;
IDirect3DDevice9
*
device
;
IDirect3D9
*
d3d9
;
unsigned
int
i
;
ULONG
refcount
;
HWND
window
;
HRESULT
hr
;
void
*
data
;
if
(
!
(
d3d9
=
pDirect3DCreate9
(
D3D_SDK_VERSION
)))
{
skip
(
"Failed to create d3d9 object, skipping tests.
\n
"
);
return
;
}
window
=
CreateWindowA
(
"d3d9_test_wc"
,
"d3d9_test"
,
WS_OVERLAPPEDWINDOW
,
0
,
0
,
640
,
480
,
0
,
0
,
0
,
0
);
if
(
!
(
device
=
create_device
(
d3d9
,
window
,
window
,
TRUE
)))
{
skip
(
"Failed to create a D3D device, skipping tests.
\n
"
);
IDirect3D9_Release
(
d3d9
);
DestroyWindow
(
window
);
return
;
}
hr
=
IDirect3DDevice9_CreateVertexBuffer
(
device
,
1024
,
D3DUSAGE_DYNAMIC
,
0
,
D3DPOOL_DEFAULT
,
&
buffer
,
NULL
);
ok
(
SUCCEEDED
(
hr
),
"Failed to create vertex buffer, hr %#x.
\n
"
,
hr
);
for
(
i
=
0
;
i
<
(
sizeof
(
test_data
)
/
sizeof
(
*
test_data
));
++
i
)
{
hr
=
IDirect3DVertexBuffer9_Lock
(
buffer
,
0
,
0
,
&
data
,
test_data
[
i
].
flags
);
/* Windows XP always returns D3D_OK even with flags that don't make
* sense. Windows 7 returns an error. At least one game (Shaiya)
* depends on the Windows XP result, so mark the Windows 7 behavior as
* broken. */
ok
(
hr
==
D3D_OK
||
broken
(
hr
==
test_data
[
i
].
win7_result
),
"Got unexpected hr %#x for %s.
\n
"
,
hr
,
test_data
[
i
].
debug_string
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
!!
data
,
"Got unexpected data %p.
\n
"
,
data
);
hr
=
IDirect3DVertexBuffer9_Unlock
(
buffer
);
ok
(
SUCCEEDED
(
hr
),
"Failed to unlock vertex buffer, hr %#x.
\n
"
,
hr
);
}
}
IDirect3DVertexBuffer9_Release
(
buffer
);
refcount
=
IDirect3DDevice9_Release
(
device
);
ok
(
!
refcount
,
"Device has %u references left.
\n
"
,
refcount
);
IDirect3D9_Release
(
d3d9
);
DestroyWindow
(
window
);
}
static
const
char
*
debug_d3dpool
(
D3DPOOL
pool
)
{
switch
(
pool
)
{
case
D3DPOOL_DEFAULT
:
return
"D3DPOOL_DEFAULT"
;
case
D3DPOOL_SYSTEMMEM
:
return
"D3DPOOL_SYSTEMMEM"
;
case
D3DPOOL_SCRATCH
:
return
"D3DPOOL_SCRATCH"
;
case
D3DPOOL_MANAGED
:
return
"D3DPOOL_MANAGED"
;
default:
return
"unknown pool"
;
}
}
static
void
test_vertex_buffer_alignment
(
void
)
{
static
const
D3DPOOL
pools
[]
=
{
D3DPOOL_DEFAULT
,
D3DPOOL_SYSTEMMEM
,
D3DPOOL_SCRATCH
,
D3DPOOL_MANAGED
};
static
const
DWORD
sizes
[]
=
{
1
,
4
,
16
,
17
,
32
,
33
,
64
,
65
,
1024
,
1025
,
1048576
,
1048577
};
IDirect3DVertexBuffer9
*
buffer
=
NULL
;
const
unsigned
int
align
=
16
;
IDirect3DDevice9
*
device
;
unsigned
int
i
,
j
;
IDirect3D9
*
d3d9
;
ULONG
refcount
;
HWND
window
;
HRESULT
hr
;
void
*
data
;
if
(
!
(
d3d9
=
pDirect3DCreate9
(
D3D_SDK_VERSION
)))
{
skip
(
"Failed to create d3d9 object, skipping tests.
\n
"
);
return
;
}
window
=
CreateWindowA
(
"d3d9_test_wc"
,
"d3d9_test"
,
WS_OVERLAPPEDWINDOW
,
0
,
0
,
640
,
480
,
0
,
0
,
0
,
0
);
if
(
!
(
device
=
create_device
(
d3d9
,
window
,
window
,
TRUE
)))
{
skip
(
"Failed to create a D3D device, skipping tests.
\n
"
);
IDirect3D9_Release
(
d3d9
);
DestroyWindow
(
window
);
return
;
}
for
(
i
=
0
;
i
<
(
sizeof
(
sizes
)
/
sizeof
(
*
sizes
));
++
i
)
{
for
(
j
=
0
;
j
<
(
sizeof
(
pools
)
/
sizeof
(
*
pools
));
++
j
)
{
hr
=
IDirect3DDevice9_CreateVertexBuffer
(
device
,
sizes
[
i
],
0
,
0
,
pools
[
j
],
&
buffer
,
NULL
);
if
(
pools
[
j
]
==
D3DPOOL_SCRATCH
)
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#x trying to create a D3DPOOL_SCRATCH buffer.
\n
"
,
hr
);
else
ok
(
SUCCEEDED
(
hr
),
"Failed to create vertex buffer in pool %s with size %u, hr %#x.
\n
"
,
debug_d3dpool
(
pools
[
j
]),
sizes
[
i
],
hr
);
if
(
FAILED
(
hr
))
continue
;
hr
=
IDirect3DVertexBuffer9_Lock
(
buffer
,
0
,
0
,
&
data
,
0
);
ok
(
SUCCEEDED
(
hr
),
"Failed to lock vertex buffer, hr %#x.
\n
"
,
hr
);
ok
(
!
((
DWORD_PTR
)
data
&
(
align
-
1
)),
"Vertex buffer start address %p is not %u byte aligned (size %u, pool %s).
\n
"
,
data
,
align
,
sizes
[
i
],
debug_d3dpool
(
pools
[
j
]));
hr
=
IDirect3DVertexBuffer9_Unlock
(
buffer
);
ok
(
SUCCEEDED
(
hr
),
"Failed to unlock vertex buffer, hr %#x.
\n
"
,
hr
);
IDirect3DVertexBuffer9_Release
(
buffer
);
}
}
refcount
=
IDirect3DDevice9_Release
(
device
);
ok
(
!
refcount
,
"Device has %u references left.
\n
"
,
refcount
);
IDirect3D9_Release
(
d3d9
);
DestroyWindow
(
window
);
}
START_TEST
(
device
)
{
HMODULE
d3d9_handle
=
LoadLibraryA
(
"d3d9.dll"
);
...
...
@@ -3880,6 +4028,8 @@ START_TEST(device)
test_set_rt_vp_scissor
();
test_volume_get_container
();
test_volume_resource
();
test_vb_lock_flags
();
test_vertex_buffer_alignment
();
}
out
:
...
...
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