407f78e9e1
ddraw: Merge texture.c into surface.c.
2010-08-19 11:17:29 +02:00
3eba8b5d22
ddraw: Merge gamma.c into surface.c.
2010-08-19 11:17:15 +02:00
fee9c1f2b5
ddraw: Remove a useless viewport callback.
2010-08-18 09:41:01 +02:00
14399f6130
ddraw: Remove a useless material callback.
2010-08-18 09:40:55 +02:00
06a44abc19
ddraw: Remove useless light callbacks.
2010-08-18 09:40:32 +02:00
8394f00661
ddraw: Merge direct3d.c into ddraw.c.
2010-08-18 09:40:29 +02:00
f55e2374a0
ddraw: Use FAILED instead of NOT SUCCEEDED.
2010-08-16 13:46:42 +02:00
5c05b14167
ddraw/tests: New attachment/flipping tests for back buffers.
2010-08-04 12:27:11 +02:00
109cb9fee4
ddraw/tests: New CreateSurface for DDSCAPS_BACKBUFFER tests.
2010-08-04 12:27:04 +02:00
3ad82a82bb
wined3d: The stateblock doesn't have a parent.
2010-07-30 11:36:03 +02:00
51a315386e
ddraw: Use a less offensive handle table implementation for surfaces.
2010-07-30 11:36:03 +02:00
91193b6eec
ddraw: Use a less offensive handle table implementation for stateblocks.
2010-07-30 11:36:02 +02:00
941aeade01
ddraw: Use a less offensive handle table implementation for matrices.
2010-07-29 17:33:36 +02:00
0cb4de4542
ddraw: Use a less offensive handle table implementation for materials.
2010-07-29 17:33:35 +02:00
1fb67788b1
ddraw: Added a todo_wine test for SetCooperativeLevel.
2010-07-28 16:28:22 +02:00
a58f31dd27
ddraw: Tighten up checks in DuplicateSurface (Coverity).
2010-07-26 18:38:29 +02:00
b86d515ed6
dlls: Remove explicit imports of kernel32 and ntdll.
2010-07-21 17:38:36 +02:00
ce8f6ecf6e
ddraw: Merge the surface thunks into surface.c.
2010-07-20 13:13:04 +02:00
6fb9ee0ee7
ddraw: Merge the ddraw thunks into ddraw.c.
...
Note how both ddraw 1 and ddraw 7 used the same IDirectDrawImpl_XXX naming
convention.
2010-07-20 13:13:04 +02:00
1edda50c03
ddraw: The surface isn't allowed to be NULL in EnumSurfacesCallbackThunk() and EnumCallback().
2010-07-19 14:49:07 +02:00
5bf9dd902c
ddraw: Get rid of some dead code.
2010-07-19 14:49:07 +02:00
f461b39b76
ddraw: Get rid of the useless "ddraw_owner" fields.
2010-07-19 14:49:07 +02:00
16b3f17f87
ddraw: Avoid some forward declarations.
2010-07-19 14:49:07 +02:00
8b1c1edb6b
ddraw/tests: Test IDirect3D::FindDevice HAL enumeration.
2010-07-19 14:48:54 +02:00
14744c44b1
ddraw: Don't permit the enumeration of the Direct3D reference device in IDirect3D1::FindDevice.
2010-07-19 14:41:33 +02:00
d5c2a358b7
ddraw: Return a failure code in IDirectDrawSurfaceImpl::QueryInterface if IDirect3D7::CreateDevice fails.
2010-07-19 14:41:11 +02:00
f18cb4c2f4
ddraw: Grow index buffer as needed.
2010-06-30 16:19:13 +02:00
cf39adbaa2
ddraw: Avoid an integer overflow in IDirectDrawSurfaceImpl_BltFast().
...
Bug spotted by Iain Arnell, test by Iain Arnell.
2010-06-24 15:11:43 +02:00
7649c75b40
Assorted typo and spelling fixes.
2010-06-24 10:37:05 +02:00
bdc29f83bc
ddraw/tests: Add an observation regarding device color model criteria for IDirect3D3::FindDevice.
2010-06-22 11:47:39 +02:00
eb9227015a
ddraw: Allow the ddraw RGB device to be enumerated in IDirect3D3::FindDevice.
...
Partially based on a patch by David Adam.
2010-06-22 11:47:24 +02:00
10a076ad8d
ddraw: Validate structure pointers and sizes in IDirect3D3::FindDevice.
2010-06-22 11:24:59 +02:00
e4a4065bbd
ddraw: Register / unregister the ddraw window class from DllMain().
...
This avoids failing in DDRAW_Create() if a previous IDirectDrawImpl object
with the same pointer value was imporperly cleaned up. The improper cleanup is
of course the larger problem, but I don't believe that can be fixed without
making more invasive changes to ddraw.
2010-06-18 15:22:22 +02:00
989e98202f
ddraw: Remove redundant "not NULL" check of This (coccicheck).
2010-05-18 18:42:07 +02:00
f97c995054
ddraw: Fix missing D3D misc caps.
2010-05-03 17:20:15 +02:00
cef28bb3a2
ddraw: Change return to break in PixelFormat_WineD3DtoDD().
2010-05-03 14:00:15 +02:00
40cd9a7ff0
ddraw: Fix discrepancy in alpha mask for WINED3DFMT_B2G3R3A8_UNORM.
2010-05-03 13:57:58 +02:00
7c90c1a0b5
ddraw: Do not restore the display mode from inside SetCooperativeLevel.
2010-04-19 16:06:01 +02:00
15b959fba7
ddraw/tests: Added todo_wine test to verify resizing of fullscreen windows.
2010-04-07 18:13:05 +02:00
f97a9e3c0f
ddraw: Fix and clarify texture filter state mappings.
2010-04-06 11:48:59 +02:00
1289842da3
wined3d: Move handling of the unimplemented WINED3DRS_STIPPLEPATTERN states to ddraw.
2010-04-02 10:36:06 +02:00
2e5976a8c5
wined3d: Move handling of the unimplemented WINED3DRS_BORDERCOLOR state to ddraw.
2010-04-02 10:35:54 +02:00
2930f84961
ddraw: Add some DirectDraw Blt tests.
2010-03-30 13:55:05 +02:00
914c8cb8ea
ddraw: Acquire/release the focus window from the correct location.
2010-03-18 10:24:15 +01:00
b5ddd6f0fc
ddraw: Use a D24X8 depth buffer.
2010-03-17 16:08:48 +01:00
89fef0e669
ddraw: Fix IDirectDraw4Impl_GetSurfaceFromDC().
...
Perhaps interesting to note is that this returns an IDirectDrawSurface instead
of an IDirectDrawSurface4.
2010-03-17 10:06:29 +01:00
4e48ae2629
ddraw: Implement IDirectDrawImpl_GetSurfaceFromDC().
...
This is a pretty naive implementation, should that become a performance
problem it's easy enough to speed up with a search tree of some kind.
2010-03-17 10:06:25 +01:00
bef5645eb1
makefiles: Remove the no longer needed explicit separators for dependencies.
2010-03-16 13:28:19 +01:00
ae437ab5b8
ddraw: Print unhandled vertex processing flags in IDirect3DExecuteBufferImpl_Execute().
2010-03-15 15:55:14 +01:00
67a2751b94
ddraw: Remove redundant memset.
2010-03-15 13:28:24 +01:00
2e48bdd144
ddraw/tests: Fix typos.
2010-03-01 12:05:53 +01:00
6164ce2d82
makefiles: Use the standard C_SRCS variable as the list of test files.
...
This enables it to be auto-updated by make_makefiles.
2010-02-22 10:47:11 +01:00
22fc1fe366
ddraw/tests: Fix a test failure on VMware and VirtualBox on W2K and below.
2010-02-15 16:09:31 +01:00
e0213af9ab
ddraw: Enable GetViewport to retreive data set by SetViewport2 and vice-versa + tests.
2010-02-15 12:51:23 +01:00
720aa5bf23
ddraw: Fix D3DTBLEND_MODULATE emulation.
...
Alpha source should be selected with WINED3DTSS_ALPHAOP and not by changing the source itself.
2010-02-15 12:51:09 +01:00
bb035638d0
d3d: Make sure vertexbuffer lock doesn't return a NULL pointer.
2010-02-09 11:33:53 +01:00
6d1ba98f5b
ddraw/tests: Fix a test that fails on Win2k.
2010-02-05 11:54:51 +01:00
a9f969094c
ddraw: Convert VB lock flags to wined3d flags.
2010-01-29 14:59:02 +01:00
f0266ee519
ddraw: Test invalid buffer lock parameters.
2010-01-29 14:59:02 +01:00
69861cf873
wined3d: Get rid of the depth range hack.
2010-01-27 11:16:07 +01:00
ec03d3e4f1
ddraw: Add depth clamp tests.
2010-01-27 11:15:58 +01:00
a0789f611d
ddraw: Simplify DllCanUnloadNow().
2010-01-14 09:03:58 -06:00
9ae92661cc
ddraw: Remove a redundant return.
2009-12-30 13:31:30 +01:00
67cba48782
wined3d: The FVF parameter to IWineD3DDeviceImpl_CreateVertexBuffer() is unused now.
2009-12-30 13:31:20 +01:00
df9bddcd27
ddraw: Improve error message.
2009-12-23 14:27:30 +01:00
34e82e3dbd
ddraw: Fix an incorrect refcount test.
2009-12-18 11:39:48 +01:00
aa305c4a24
ddraw: Don't depend on IWineD3DDevice_CreateSurface() not touching the surface parameter on failure.
...
The reason it actually fails is because of ddraw trying to create surface of
type "SURFACE_UNKNOWN". Stefan should have a patch for that.
2009-12-18 11:38:30 +01:00
6d8c4572ef
wined3d: Fix a bug in BtlFast which was uncovered by the 32-bit dibsection support.
2009-12-17 12:53:19 +01:00
e79a6b20d2
ddraw/tests: Add tests for ddraw window proc handling.
2009-12-17 12:43:05 +01:00
bf64bbd1fb
ddraw/tests: Get rid of a carriage return in a trace.
2009-12-14 12:04:06 +01:00
0f0d92bf13
ddraw/tests: Fix some test failures on Vista+.
2009-12-10 15:01:06 +01:00
ddddc60eb9
ddraw: Avoid enumerating display modes for formats that arent't supported anyway.
...
Some of these formats can't even be translated by ddraw.
2009-12-10 11:54:22 +01:00
55f3c576d9
wined3d: Remove the effetively unused "state" field from the device.
2009-11-18 11:16:54 +01:00
38d44e0a52
ddraw/tests: Fix test failure for D3DFMT_A2R10G10B10 pixel format in GetDC tests.
2009-11-17 15:14:56 +01:00
8a1f0eed8e
ddraw/tests: Fix a test failure on systems with no DirectDraw7.
2009-11-03 21:26:46 +01:00
d4275e87f1
wined3d: Add a usage flag for static buffer declarations.
2009-11-03 21:21:55 +01:00
90e443758a
wined3d: Add a parameter for SetRenderTarget viewport setup.
2009-11-03 21:21:30 +01:00
f222a1654e
ddraw: Avoid memory overwrite in GetDeviceIdentifier().
2009-10-30 16:32:53 +01:00
bf10dbe8a6
wined3d: Map D3DFMT_D24S8 to WINED3DFMT_D24_UNORM_S8_UINT.
...
The internal order of the depth and stencil bits is unspecified since the
format isn't lockable.
2009-10-30 11:28:52 +01:00
052d955567
wined3d: Don't depend on uninitialized data in the CreateSurface() thunks (Valgrind).
...
Perhaps IDirectDraw7_CreateSurface() should also always set "pSurface7" to
NULL on failure, but at least for our internal functions that's a silly thing
to rely on.
2009-10-29 13:09:45 +01:00
e1bf800ba5
ddraw/tests: Fix a test failure on Win9x/WinMe.
2009-10-21 16:05:57 +02:00
323f163af4
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2009-10-19 14:45:21 +02:00
02772641b2
ddraw/tests: Remove some leftover debug code.
2009-10-19 11:45:36 +02:00
c45609f15c
ddraw/tests: Check some more return values (LLVM/Clang).
2009-10-16 13:37:00 +02:00
e95ffacde0
ddraw: Make SetColorKey handle case where dwColorSpaceHighValue < dwColorSpaceLowValue + tests.
2009-10-15 12:06:22 +02:00
e80144c403
d3d: Make EndScene calls hookable.
2009-10-14 12:21:06 +02:00
64367542d0
ddraw: Make directdraw create functions hookable.
2009-10-14 12:21:06 +02:00
72fab20ffe
ddraw/tests: Don't crash on older ddraw.
2009-10-12 12:14:03 +02:00
7211f7ce18
ddraw: Implement and test DirectDrawEnumerateExW.
2009-10-09 11:50:28 +02:00
3496fe5f43
ddraw: More fully implement and test DirectDrawEnumerateExA.
2009-10-09 11:50:28 +02:00
bab8f7e557
ddraw: Implement and test DirectDrawEnumerateW.
2009-10-09 11:50:14 +02:00
4c61c2ff63
ddraw: Simplify and test DirectDrawEnumerateA.
2009-10-09 11:40:16 +02:00
611fae610c
ddraw/tests: Remove a superfluous return statement.
2009-10-09 11:40:07 +02:00
ddd255cb08
ddraw/tests: Fix some test failures on WinME/VMware.
2009-10-08 12:17:30 +02:00
9e068a33b3
wined3d: SetRenderTarget doesn't change the viewport in d3d7.
2009-10-02 15:06:56 +02:00
dbb29993db
ddraw: Set dwBackBufferCount=0 in CreateSurface for backbuffer.
2009-09-29 16:06:47 +02:00
33bfcdd044
ddraw: The ddraw surface is now always the wined3d surface's parent.
...
This GetParent() trick would now cause infinite recursion.
2009-09-25 15:15:55 +02:00
47c84f4f7f
wined3d: Use the DXGI naming convention for all formats.
2009-09-25 15:15:44 +02:00
60e32659a7
wined3d: Rename IWineD3DDevice::SetIndices() to IWineD3DDevice::SetIndexBuffer().
2009-09-25 15:14:44 +02:00
66a7236590
wined3d: Don't free D3D vertex declarations until the wined3d vertex declaration is destroyed.
2009-09-23 12:36:28 +02:00
93b0600829
wined3d: Don't free D3D buffers until the wined3d buffer is destroyed.
2009-09-18 08:55:25 -05:00
a8e8f763bf
wined3d: Don't free D3D textures until the wined3d texture is destroyed.
2009-09-18 08:54:34 -05:00
6c8636c337
ddraw: Mark internal symbols hidden.
2009-09-17 10:10:04 -05:00
de3bd86fb6
wined3d: Don't free D3D cube textures until the wined3d cube texture is destroyed.
2009-09-17 10:09:44 -05:00
a5214c306f
wined3d: Don't free D3D surfaces until the wined3d surface is destroyed.
...
This prevents for example a d3d9 depth stencil from being destroyed when it
has no external references but is still in use by the device/stateblock. A
nice side effect is that it simplifies handling of "implicit" surfaces like
the frontbuffer and backbuffers, as well as the forwarding of reference counts
for surfaces that are part of a texture.
2009-09-16 13:04:32 -05:00
3eb62ed62c
ddraw: Complete recognition of pixelformat 19: X8L8V8U8.
2009-09-15 16:41:24 -05:00
2b2fc827ce
wined3d: Remove unused parameters to drawPrimitive().
2009-09-11 12:09:14 +02:00
e1469961d4
wined3d: Test and fix ddraw and d3d9 GetDC differences.
...
The MSDN is not totally correct: A8R8G8B8 and A1R5G5B5 also allow GetDC. The
main differences that have to be filtered out in d3d9.dll are GetDC on
A8B8G8R8, X8B8G8R8 and P8.
2009-09-08 13:04:52 +02:00
ee60e5fd71
ddraw: Remove trailing spaces.
2009-09-01 14:06:03 +02:00
e168876d8f
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2009-08-31 12:41:21 +02:00
c0892c2f35
ddraw: d3d7 does not support two sided stencil.
...
The header is wrong. There is simply no API to set this. The MS header does
not have this declaration either.
2009-08-06 17:26:31 +02:00
7165bd19c1
wined3d: WINED3DTEXF_NONE only makes sense as a mip filter.
2009-08-05 11:20:43 +02:00
99139d9671
ddraw: Constify some variables.
2009-07-24 11:44:17 +02:00
60d389670a
ddraw/tests: Properly release surfaces even if we can't get the texture object.
2009-07-14 11:29:47 +02:00
340f5734bf
ddraw/tests: Fix a failing test on 64-bit.
2009-07-14 11:29:47 +02:00
5622f74486
ddraw/tests: Fix a few tests that fail on Win64.
2009-07-10 20:52:41 +02:00
d1e5b3bf62
ddraw: Fix two bounds checks.
2009-06-22 11:44:19 +02:00
3176d936f9
ddraw: Fix error checking in IDirect3DExecuteBufferImpl_Execute().
2009-06-22 11:44:06 +02:00
882716e78b
ddraw: Use correct union member.
2009-06-15 13:42:30 +02:00
88162fabb8
wined3d: Get rid of the pointers in WINED3DSURFACE_DESC.
2009-06-15 13:42:29 +02:00
4bc6b376e0
wined3d: Remove the useless "resource_type" parameter from IWineD3DDevice::CreateSurface().
2009-06-12 17:33:15 +02:00
73abda63d7
ddraw: Add tests for DirectDrawSurface reference counting.
2009-05-20 11:09:07 +02:00
82b7fc6855
ddraw/tests: Replace malloc() with HeapAlloc().
2009-05-13 12:45:36 +02:00
ad66aa77a4
ddraw/tests: Fix a test failure on VirtualBox.
2009-05-04 12:51:15 +02:00
6f33b97c94
wined3d: Get rid of the shared_handle parameter.
...
I don't expect us to support this in the near future, and right now it's just
dead code.
2009-04-23 14:22:06 +02:00
06d2b30903
ddraw/tests: Add tests for refcount handling of light with viewport.
2009-04-21 16:30:36 +02:00
ffb5f749d5
ddraw: Handle refcount of lights when interacting with viewport.
2009-04-21 16:30:32 +02:00
8681d49030
ddraw: Remove useless comments.
2009-04-21 16:30:04 +02:00
cb1c9dcda9
d3d: Remove the format from index buffers.
2009-04-09 16:28:25 +02:00
f0efa97413
wined3d: Remove the buffer fvf.
2009-04-09 16:28:10 +02:00
fd9b574e4e
ddraw: Store the fvf in the ddraw buffer.
...
WineD3D buffer FVFs will go away soon.
2009-04-09 16:27:35 +02:00
513a493f00
wined3d: Merge IWineD3DIndexBuffer and IWineD3DBuffer.
2009-04-08 11:37:29 +02:00
3ed94329a3
wined3d: Use Map and Unmap for index buffers.
...
Just a change in name to prepare for the next patch
2009-04-08 11:36:18 +02:00
dc80a3ede5
d3d: Unify WINED3DVERTEXBUFFER_DESC and WINED3DINDEXBUFFER_DESC.
2009-04-08 11:36:02 +02:00
4194d8040f
ddraw: Filter invalid texture stage states passed by the application.
2009-04-01 14:23:38 +02:00
4434d00f84
wined3d: Unify vertex and texture formats.
...
Some fields should be redundant now, eg. gl_vtx_type and glType. I'll leave
that for a different patch to fix though.
2009-03-27 15:51:25 +01:00
d7c7c76850
wined3d: Use separate structures for ddraw style strided data and wined3d's internal stream info.
2009-03-27 15:51:25 +01:00
e1a1ae5e1b
ddraw/tests: Skip some cooperative level tests on NT4/Win95.
...
The DirectX SDK reports that cooperative level flags
DDSCL_SETDEVICEWINDOW and DDSCL_SETFOCUSWINDOW are only
available on Windows 98 and higher.
2009-03-23 18:21:06 +01:00
58f2a01e23
ddraw/tests: Use ULONG instead of unsigned long.
2009-03-23 12:41:21 +01:00
5974ad1200
ddraw/tests: Fix a test failure on VMware and some native boxes.
2009-03-13 14:55:47 +01:00
27f52727e4
ddraw/tests: Fix two test failures on W2K/VMware.
2009-03-13 14:53:02 +01:00
d5e9c3cf92
ddraw/tests: Fix some test failures on W2K/VMware.
2009-03-12 13:09:53 +01:00
ae1802d01b
ddraw/tests: Fix some test failures on W2K/VMware.
2009-03-11 16:03:32 +01:00
aa3027a604
wined3d: Merge IWineD3DVertexBuffer with IWineD3DBuffer.
...
That still leaves IWineD3DIndexBuffer, but that code is also mostly similar,
except for the conversion code (which will be unused there).
2009-03-06 15:35:58 +01:00
702eeb6b0c
wined3d: Add separate methods for setting the primitive type.
2009-03-05 16:16:25 +01:00
602bb1f551
wined3d: Pass the vertex count rather than the primitive count to wined3d draw methods.
2009-03-05 16:16:24 +01:00
e047edb080
ddraw/tests: Allow IDirectDrawSurface_AddAttachedSurface failure on Windows.
2009-03-05 12:47:02 +01:00
f716306f36
ddraw: Implement IDirect3DViewportImpl_NextLight.
2009-03-04 13:03:52 +01:00
22bfd1396c
ddraw: Implement ComputeSphereVisibility.
2009-02-26 15:13:25 +01:00
77a3cffb1b
ddraw/tests: Use win_skip() to skip over unimplemented functionality.
2009-02-24 16:57:26 +01:00
0048a0373b
d3d10core: Keep a reference to the wined3d device in the d3d10 device.
2009-02-23 12:20:29 +01:00
8cefc47d81
wined3d: Add DXGI formats to WINED3DFORMAT.
2009-02-20 11:10:37 +01:00
4542ab35b4
ddraw/tests: Use skip() instead of trace().
2009-02-19 12:54:25 +01:00
b63728a850
ddraw/tests: Don't crash on W2K.
2009-02-19 12:54:21 +01:00
f879176b99
ddraw: Use ddraw_from_d3d7 to make a (IDirectDrawImpl *) from a (IDirect3D7 *).
2009-02-10 12:31:50 +01:00
8a46be6cee
ddraw/tests: Fix missing void in empty parameter list.
2009-01-28 12:10:49 +01:00
96e81f0698
ddraw: Make some device_parent_*() functions static.
2009-01-26 15:13:26 +01:00
62b8b9a8fd
ddraw/tests: Add a few tests for ComputeShereVisibility.
2009-01-26 14:30:17 +01:00
9b5f3ed8f3
ddraw: Rename the main vtables to lpVtbl.
2009-01-22 15:28:22 +01:00
c0e72b0556
ddraw: Get rid of CONVERT and CONVERT_REV.
2009-01-22 12:05:18 +01:00
b09b0fbf95
ddraw: Get rid of ddcomimpl.h.
2009-01-22 12:05:14 +01:00
802f9c7e29
ddraw: Get rid of ICOM_OBJECT.
2009-01-22 12:05:07 +01:00
8c4cc2af46
ddraw: Get rid of ICOM_THIS_FROM.
2009-01-22 12:05:03 +01:00
772e56a2d8
ddraw: Get rid of ICOM_VFIELD_MULTI_NAME and ICOM_VFIELD_OFFSET.
2009-01-21 11:17:41 +01:00
9a0c885e63
ddraw: Get rid of ICOM_INTERFACE.
2009-01-21 11:17:25 +01:00
ad171b143f
ddraw: Get rid of ICOM_INIT_INTERFACE.
2009-01-21 11:16:51 +01:00
4e38c2e943
ddraw: Get rid of ICOM_VFIELD_MULTI.
2009-01-21 11:16:41 +01:00
94c98d0697
ddraw: Get rid of ICOM_VFIELD_MULTI_NAME2.
2009-01-21 11:16:34 +01:00
ba771f0fac
ddraw: Fix Thunk_IDirect3DDeviceImpl_2_GetCurrentViewport().
2009-01-20 12:34:20 +01:00
b2d42ad665
ddraw: Compare the against the correct IID in IDirect3DExecuteBufferImpl_QueryInterface().
2009-01-20 12:34:17 +01:00
2afa23867b
ddraw: Add extern to some global variable declarations.
2009-01-16 13:30:08 +01:00
a966293f59
wined3d: Add an IWineD3DDeviceParent interface.
...
Other than being a bit nicer than passing function pointers all over the
place, this helps dxgi/d3d10. While the swapchain itself is created in dxgi,
its surfaces are constructed in d3d10core, which makes it impractical for dxgi
to pass the appropriate function pointers.
2009-01-16 13:29:32 +01:00
5ee7a104c9
ddraw: Remove superfluous pointer casts.
2009-01-14 12:21:02 +01:00
1ac07906ae
ddraw: Fix double unlock of critical section.
2009-01-10 17:43:10 +01:00
ae4e824423
ddraw[ex]: Show a caps handling difference.
2009-01-09 16:18:12 +01:00
149259d49f
ddraw: Fix an uninitialized variable warning on non-i386.
2009-01-08 17:30:22 +01:00
cc447eac55
wined3d: Move position_transformed out of u.s in struct WineDirect3DVertexStridedData.
2009-01-08 13:21:31 +01:00
352e60e6ed
d3d: Explicitly translate texture stage states.
...
Ddraw and d3d8 already translate half of them, it turns out the lookup
table actually saves lines there.
2009-01-06 12:45:32 +01:00
c51bc826e8
ddraw: Properly handle sampler states.
2009-01-06 12:45:20 +01:00
91bb8dc043
ddraw/tests: Remove superfluous casts.
2009-01-04 13:34:13 +01:00
566a133a82
ddraw/tests: Simplify a pointer increment.
2009-01-04 13:34:05 +01:00
6ef2b65531
ddraw: Reject IDirectDraw3 QI in ddraw.dll.
2009-01-03 15:14:51 +01:00
616ea53226
ddraw: Add a test for IDirectDrawSurface::GetDC.
2009-01-03 15:14:38 +01:00
3b64f895b1
ddraw: Display fixme only once in IDirectDrawImpl_WaitForVerticalBlank.
2009-01-02 11:51:29 +01:00
a537fb0a93
ddraw: Fix surface version setting.
2008-12-26 13:42:29 +01:00
dcbb91fc92
ddraw: Remove a superfluous semicolon.
2008-12-24 19:59:04 +01:00
9605eb5af2
ddraw: Display fixme only once in IDirect3DVertexBufferImpl_Optimize.
2008-12-24 19:57:51 +01:00
26b9f8ef26
ddraw/tests: Fix alpha_test and offscreen_test on geforce 8800 on XP.
2008-12-23 20:12:28 +01:00
a14fe082bf
ddraw/tests: Fis some ok() lines in alpha_test().
2008-12-23 20:11:40 +01:00
8bd9a3aa09
janitorial: Don't depend on user32 for the self registration functions.
2008-12-17 11:38:32 +01:00
ab9f028958
ddraw/tests: Make some functions static.
2008-12-15 12:25:41 +01:00
76b24fd970
ddraw/tests: Fix a test failure on a Win98 VMware box.
2008-12-12 11:38:26 +01:00
1632175b35
ddraw: Fix trace.
2008-12-08 12:02:36 +01:00
ebb31dbbb7
ddraw/tests: Skip tests if we can't create a primary surface.
2008-12-05 13:52:38 +01:00
176c8eb333
ddraw: Remove two superfluous casts.
2008-12-05 12:36:34 +01:00
9d3026ff40
ddraw: Fix some comments.
2008-12-03 09:49:24 +01:00
23abbcb9b3
ddraw: Make some functions static.
2008-12-02 15:27:08 +01:00
a6917b143d
wined3d: Use IDL to generate wined3d.h.
2008-11-25 13:37:22 +01:00
fcfe436de5
ddraw: Remove WINAPI on static functions where not needed.
2008-11-24 14:25:09 +01:00
902bee8f09
ddraw/tests: Skip tests when DirectDraw4 is not supported.
2008-11-12 12:55:09 +01:00
10e5d3aa12
ddraw/tests: Fix a typo.
2008-11-12 12:55:03 +01:00
fbdb78c888
ddraw/tests: Fix a test on W2K3.
2008-11-05 10:54:40 +01:00
092b51e82a
wined3d: Rename CreateAdditionalSwapChain to CreateSwapChain.
2008-10-28 12:46:46 +01:00
7142754820
wined3d: Remove the SDKVersion parameter to WineDirect3DCreate().
2008-10-24 14:24:59 +02:00
99a50b5396
ddraw: Make sure pWineDirect3DCreate and pWineDirect3DCreateClipper match the header.
2008-10-24 14:24:59 +02:00
e1ced22db1
ddraw: Convert source files to utf-8.
2008-10-18 19:19:45 +02:00
8299df900c
ddraw: Remove a few more redundant inits (LLVM/Clang).
2008-10-10 12:27:28 +02:00
ff5a860c0c
ddraw/tests: Use FAILED instead of !SUCCEEDED.
2008-10-08 13:42:11 +02:00
623ee7775b
ddraw: Sign-compare warning fix.
2008-10-01 09:56:54 -05:00
a697d99d66
ddraw: Sign-compare warnings fix.
2008-09-29 17:32:17 -05:00
a12509532c
ddraw/tests: Fix a test on a Win98 box.
2008-09-22 12:16:53 +02:00
7dd099416e
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-09-08 12:47:21 +02:00
55faa6e911
ddraw/tests: Let tests run again on win9x.
2008-09-03 13:14:51 +02:00
09d0a35872
ddraw: Add some overlay tests.
2008-09-02 15:05:59 +02:00
ddec94bf0f
ddraw: Pass proper parameters to CheckDeviceFormat.
2008-09-02 14:56:45 +02:00
c1eabc2ce7
ddraw: Catch attempts to opengl-render to the desktop window.
2008-09-02 14:56:35 +02:00
d5f05c59c7
ddraw: Beware of the surface type when checking for format support.
2008-09-02 14:56:26 +02:00
3b48660f43
wined3d: Implement YV12 support for emulated overlays.
...
This is the prefered format of many codecs, and for some codecs this
is the only supported output format. As usual I try to handle all the
conversion in the GPU and keep the CPU involvement minimal to gain the
full performance of PBO transfers.
2008-09-02 14:55:50 +02:00
ec4955630e
wined3d: Silence some format spam.
2008-08-28 11:24:49 +02:00
58ac095d9d
ddraw: Don't destroy the application's window.
2008-08-26 12:07:40 +02:00
bb67a925d6
ddraw: Only ddraw checks wether one can give a null pointer to SetMaterial.
2008-08-22 11:32:09 +02:00
e718eae9e2
ddraw/tests: Skip cubemap tests when cubemap isn't supported.
2008-08-21 13:35:12 +02:00
a950d3a10e
ddraw: Set the bitdepth on YUV formats.
2008-08-20 12:33:33 +02:00
90e2a676e8
ddraw: Do not set the rendertarget flag just because of the backbuffer flag.
...
There are also overlay backbuffers, which aren't render targets. The
primarysurface and d3ddevice cap flags should be enough here.
2008-08-20 12:32:42 +02:00
e10302d952
ddraw: Implement IDirectDraw7::GetFourCCCodes.
2008-08-19 12:25:37 +02:00
c1bbab7c54
ddraw: Send the ddraw output to the clipper window, if any.
2008-08-19 12:25:31 +02:00
376944ebe4
wined3d: Remove the device-global fullscreen flag.
2008-08-19 12:24:57 +02:00
34b37fe241
d3d: Remove IWineD3DDevice::SetHwnd.
2008-08-19 12:22:05 +02:00
e178ddd9e1
wined3d: Use a swapchain for GDI surfaces.
...
This is a long-needed cleanup aimed at removing the ddraw_primary,
ddraw_window, ddraw_width and ddraw_height members from
IWineD3DDeviceImpl, which just do not belong there. Destination
window and screen handling is supposed to be done by swapchains.
2008-08-19 12:21:32 +02:00
851dd7339e
wined3d: Implement overlay flipping.
2008-08-05 14:09:36 +02:00
e795d842ec
wined3d: Implement overlay position tracking.
2008-08-05 14:09:36 +02:00
a47e7badb9
ddraw: Set ddraw caps in wined3d.
...
Currently the ddraw capabilities were almost static, except of D3D
support. When overlay support is added, the caps depend on certain
settings in WineD3D or capabilities available from OpenGL and Xv. So
set those caps in wined3d as well.
2008-08-04 13:10:11 +02:00
69797d7f3d
ddraw: Fix typo in copy_mipmap_chain.
2008-07-28 14:25:09 +02:00
e2ff077697
ddraw: Improve IDirect3DDevice7_Load implementation.
...
Copies palette and colorkey earlier in the helper function, before
copying image, also skips UpdateSurface when palette is missing. This
prevents unnecessary surface (re)loads in wined3d, and gets rid of
some wined3d palette error messages in Sacrifice.
2008-07-22 15:20:33 +02:00
2be93ce6b0
ddraw/tests: Add tests for surface caps memory flags.
2008-07-17 11:21:48 +02:00
59fc5a75e0
ddraw: Force surfaces without memory flags to video memory on creation.
...
Also removes now redundant setting of vidmem flag on rendertargets, prevents
adding vidmem flag when sysmem flag is present. Fixes missing textures in Forsaken.
2008-07-17 11:21:39 +02:00
79c64acc7b
tests: Don't depend on the static uuid libraries in the tests.
...
This avoids trouble with the broken MingW libraries when
cross-compiling the tests.
2008-07-08 17:51:45 +02:00
11e31e580c
ddraw: Fix a failing test for broken drivers.
2008-07-02 12:05:08 +02:00
8830dbcca8
ddraw: Fix a failing test for broken drivers.
2008-07-02 12:04:56 +02:00
cb5e06c944
ddraw: Implement FPU mode fixup in d3d7 device.
...
As documented in DirectX7 SDK, d3d7 devices set FPU mode (control word) on every
call and restore it back to original state before returning, if created in
DDSCL_FPUPRESERVE cooperative mode. This allows games to work with FPU in a
possibly incompatible mode and avoid resetting it all the time.
2008-06-23 19:59:33 +02:00
606186d4c5
ddraw: Ensure to load wined3d before attempting to create a clipper.
2008-06-23 14:11:58 +02:00
5dcec4de49
ddraw: Reset the viewport data before each test.
2008-06-18 13:51:46 +02:00
2cf47c00f2
ddraw: Avoid a not needed address-of operator.
2008-06-06 10:29:09 +02:00
7352978713
ddraw: Delete the temporarily attached surface.
2008-06-02 12:35:14 +02:00
476cb96b75
ddraw: Remove trailing spaces in Wine traces.
2008-05-30 10:01:11 +02:00
940ef7a9ff
ddraw: Do not return modes differing only by refresh rate without DDEDM_REFRESHRATES.
2008-05-29 12:09:19 +02:00
a2b645128f
ddraw: Test for IDirect3DTexture_Load of Texture into itself.
2008-05-28 19:31:35 +02:00
46ef2e06fc
ddraw: IDirect3DTextureImpl_Load failed when texture was loading onto itself.
2008-05-28 19:31:29 +02:00
f076d79c6c
ddraw/tests: Don't crash on win9x.
2008-05-28 11:32:24 +02:00
8019c55cc6
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-05-21 11:36:39 +02:00
5bf9e88cce
ddraw: Memory allocation size fix.
2008-05-13 10:40:00 +02:00
17dacf90b2
ddraw: Fix some code unprotected by ddraw lock.
2008-05-12 19:41:46 +02:00
ebf1f4e6bb
ddraw/tests: Add KEYSRCOVERRIDE test in p8_primary_test.
2008-05-09 11:19:43 +02:00
a6746b9e7b
ddraw: Indentation fix.
2008-05-07 12:24:04 +02:00
42a61d7ed7
Assorted spelling fixes.
2008-05-06 16:10:20 +02:00
c4d75213ab
ddraw/tests: Add tests for IDirect3DDevice7_Load.
2008-05-06 11:26:24 +02:00
d6ecf5d14d
ddraw: Return DDERR_NOCOLORKEY when there is no colorkey.
2008-05-06 11:26:15 +02:00
7e8be9ecc0
ddraw: Add full implementation of IDirect3DDevice7_Load.
2008-05-06 11:26:10 +02:00
30221f7bcd
ddraw: Fix some texture blending modes.
2008-05-05 19:55:30 +02:00
8f72961e50
ddraw: Move handling of D3DRENDERSTATE_TEXTUREMAPBLEND from d3ddevice2 to d3ddevice3.
2008-05-05 19:55:13 +02:00
edaaf63bd6
ddraw: Move handling of D3DRENDERSTATE_TEXTUREHANDLE from d3ddevice7 to d3ddevice3.
...
As supported by tests, there is no reason for this state to be handled by
d3ddevice7, and moving it to d3ddevice3 prepares for the changes in next patch
(setting TEXTUREHANDLE state can then go through SetTexture of d3ddevice3).
2008-05-05 19:55:05 +02:00
d5db7615a2
ddraw/tests: Add test for deprecated render states in d3d7.
2008-05-05 19:54:48 +02:00
feb753c98d
ddraw: Enable EnableAutoDepthStencil to receive depth support.
2008-05-02 11:33:38 +02:00
dad21bbcbf
makefiles: List the static libraries as normal imports instead of extra libs.
2008-04-30 14:23:55 +02:00
cf38e4c930
ddraw: Fixed device name.
2008-04-28 14:33:57 +02:00
404afbaa3c
ddraw: Remove a test that fails in VMs.
2008-04-28 13:27:51 +02:00
2f97a71e36
ddraw: Fix tests that fail with the reference rasterizer.
2008-04-25 14:53:17 +02:00
6edfd10868
ddraw: Remove unused variables.
2008-04-18 13:57:15 +02:00
4ba16af16b
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-04-14 12:40:22 +02:00
df422cf0fb
ddraw/tests: Add colorkeyed blit to p8_primary_test.
2008-04-11 13:05:12 +02:00
d8ae8a8780
ddraw/tests: Add viewport clearing tests.
2008-04-11 13:05:03 +02:00
44143a97c7
ddraw: Temporarily activate viewport when clearing.
2008-04-11 13:04:34 +02:00
3e237c6199
ddraw: Set active_device in AddViewport.
2008-04-11 13:04:26 +02:00
6a48e405db
ddraw: Add possibility to ignore lights in viewport_activate.
...
Mostly NOP regarding existing functionality, but makes it possible to skip light
activation when it's not needed (like when clearing).
2008-04-11 13:04:19 +02:00
0d0c4a355b
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-04-07 13:36:18 +02:00
f4c4488df8
Spelling fixes.
2008-04-07 13:36:17 +02:00
18b9c2bb83
ddraw/tests: Extend p8_primary_test.
...
Additional tests for blitting and locking.
2008-04-04 11:43:45 +02:00
825baa23a2
ddraw: Spelling fixes.
2008-04-03 11:39:45 +02:00
003f679cbe
ddraw/tests: Additional colorfill test in p8_primary_test.
2008-04-03 11:31:32 +02:00
2caa797e76
ddraw: Set surface to NULL on failure in GetAttachedSurface.
2008-04-03 11:30:30 +02:00
2e26c176ec
ddraw: Pass the NULL rectangle to IDirectDrawSurface::Unlock.
2008-04-02 20:29:17 +02:00
c1503a2579
ddraw: Remove some leftover test debug output.
2008-04-02 20:29:09 +02:00
ab7630fbe3
ddraw: Add a D3D7 cube map test.
...
The DirectDraw cube mapping interface has a few pitfalls. So far we have
a test testing the surface enumeration, this adds a rendering test. So
far everything used in the test works.
2008-04-02 20:29:01 +02:00
4066c2e2fd
ddraw: Do not fail if D3D is not available.
2008-04-01 20:31:51 +02:00
0ab270e41a
ddraw/tests: Initialize ddprimpal.
2008-03-28 14:49:17 +01:00
ee13cc4903
ddraw: Some EnumZBufferFormat fixes.
2008-03-27 11:10:29 +01:00
8662bd7555
ddraw: Fix some Z buffer formats.
2008-03-27 11:10:20 +01:00
eab196b35a
ddraw: Remove trailing spaces in ok() calls.
2008-03-27 11:05:40 +01:00
8869c0f147
d3d: De-pointerize the WINED3DCAPS structure.
2008-03-25 19:36:38 +01:00
a40185f12f
ddraw: Don't clear the return value anymore, we fill the fields anyway, also a test for the behaviour.
2008-03-25 12:50:33 +01:00
7a012df64d
ddraw/tests: Add test for ddraw 8-bit mode.
...
Adds rudimentary test for 8 bit mode ddraw (palettized primary surface). Tests
things like GetDC and its palette handling and SetPalette affected by patches
that follow.
2008-03-25 11:53:06 +01:00
c8837b8205
ddraw: DDRAW_dump_flags_nolf must not add LF.
2008-03-25 11:45:05 +01:00
e2d8e291d6
ddraw: Fix vertex processing.
2008-03-24 20:41:19 +01:00
eddbdbef47
ddraw/tests: Test executebuffer triangle instruction with zero count.
2008-03-24 20:40:18 +01:00
bacd2340b4
ddraw/tests: Test SetPalette on non-palettized surfaces.
2008-03-24 20:40:05 +01:00
4b53dde0f5
ddraw: Make SetPalette fail for non-palettized surfaces.
2008-03-24 20:40:00 +01:00
41310080a5
ddraw: Use a correct resource type and a valid format.
2008-03-21 15:20:21 +01:00
49c682470c
ddraw: Fix refcounting of palettes.
2008-03-17 15:16:03 +01:00
248ae8f112
ddraw: Implement ForceRefreshRate registry entry for overriding DirectX refresh rate.
2008-03-11 15:30:37 +01:00
4188af790a
ddraw: Fix diffuse and specular color types.
2008-03-06 12:46:46 +01:00
9381f22653
ddraw/tests: Don't use 0xaa to avoid any confusion when running with +heap.
2008-03-05 12:18:36 +01:00
48000893f9
makefiles: Simplify the use of the IMPORTLIB variable in the DLL makefiles.
...
Only specify the root to keep platform-specifics out of the individual
DLL makefiles.
2008-03-04 20:55:01 +01:00
069b9c8c1c
ddraw: Catch No-op SetRenderTarget operations.
2008-03-03 20:45:54 +01:00
26ad93947b
janitorial: Remove links to any microsoft site.
2008-03-01 12:04:09 +01:00
f2b77031c3
ddraw: Don't use typeof as it's not portable.
2008-02-27 14:52:24 +01:00
df5116cc7d
ddraw: Return a nullpointer as lpSurface in Lock() if the rect is invalid.
2008-02-25 19:50:30 +01:00
e2d70fff6b
ddraw: Add yv12 detection support.
2008-02-22 12:04:01 +01:00
29d87c6cbf
ddraw/tests: Add a test of D3DTBLEND_MODULATE with P8 texture.
2008-02-21 12:53:00 +01:00
9af59fb7f0
ddraw: Release interfaces when exiting with error.
2008-02-21 12:53:00 +01:00
1eb52667ac
ddraw/tests: Avoid endless loop, when T&L is not supported.
2008-02-20 12:06:28 +01:00
01cba07624
ddraw: Add missing unlock on error path. Found by Smatch.
2008-02-19 20:54:50 +01:00
74c380cb7b
ddraw/tests: Add test for palette handling in IDirect3DTexture_Load.
2008-02-19 13:39:24 +01:00
cfa40a22c9
ddraw/tests: Split d3d1 initialization and destruction into separate functions.
...
Slight rewrite to make creating additional D3D1 tests easier.
2008-02-19 13:39:23 +01:00
ed44f9d130
ddraw: Fix palette handling in IDirect3DTexture_Load.
...
This fixes a potential refcounting problem and makes the function fail with NULL
destination texture's palette and non-NULL source palette like it does on native.
2008-02-19 13:39:17 +01:00
ddd0ec1670
ddraw/tests: Add test for branch instruction with non-zero offset.
2008-02-19 12:06:50 +01:00
4981eda895
ddraw: Fix executebuffer branching with non-zero offset.
...
Fixes a crash in Moto Racer 2.
2008-02-19 12:06:38 +01:00
1079f37407
wined3d: When DDCAPS_ALLOW256 is set, palette entry 0 and 255 are filled with black and white.
2008-02-19 12:06:25 +01:00
4c8e218252
Assorted spelling fixes.
2008-02-15 12:09:24 +01:00
8354995482
ddraw: Spelling fixes in the d3d test output.
2008-02-06 13:49:45 +01:00
8ad3a1f49e
ddraw: Some drivers return a refresh rate of 0.
2008-02-06 12:43:53 +01:00
20b41af9f1
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-02-05 12:19:37 +01:00
d0794c4aeb
Assorted spelling fixes.
2008-01-23 21:16:22 +01:00
8bbb3d68e1
ddraw: Register the DirectDraw 7 Object.
2008-01-23 11:31:42 +01:00
320e253805
ddraw/tests: Add test for D3DTBLEND_MODULATE.
2008-01-22 11:19:34 +01:00
6810ebb4c1
ddraw: Fix handling of alpha with D3DTBLEND_MODULATE.
2008-01-22 11:19:18 +01:00
44b52b128c
Assorted spelling fixes.
2008-01-16 12:48:29 +01:00
7478d9c44d
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-01-16 12:46:09 +01:00
d14ef91c92
ddraw/tests: Add test for rendering vertices with zero rhw.
2008-01-08 12:53:31 +01:00
6e8b7c4cef
ddraw: Add missing pitch in callback from EnumDisplayModes().
2008-01-04 13:55:12 +01:00
f074c0e162
ddraw: Remove unneeded casts.
2008-01-02 12:38:41 +01:00
18143f693b
ddraw: Remove redundant iface<->impl casts in IDirect3DTextureImpl_Load.
...
The implementation pointer retrieved from interface ptr wasn't being used for
anything except retrieving same interface ptr back.
2007-12-31 17:48:39 +01:00
9dbdacbd82
ddraw: Release palette interfaces.
2007-12-31 17:48:16 +01:00
f4337b4714
ddraw: Fix incorrect WARN text.
2007-12-17 12:38:43 +01:00
05170942de
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-12-10 12:06:09 +01:00
4051a09eb2
ddraw: Fix wrong initialization order in IDirect3DDevice vtable.
2007-12-08 19:54:51 +01:00
f700cbe74b
wined3d: Add an alpha blending test.
2007-12-07 16:26:43 +01:00
f29d947f6a
ddraw: Set X8R8G8B8 for 32 bpp.
2007-12-07 16:26:31 +01:00
90834020da
ddraw: Modify DDRAW_dump_(DWORD|PTR|DDCOLORKEY|DDSCAPS2|pixelformat)() to print a trailing '\n'.
2007-12-07 14:52:56 +01:00
6a8f961e08
ddraw: Rename DDRAW_dump_flags_() to DDRAW_dump_flags_nolf() to clarify its difference from DDRAW_dump_flags().
2007-12-07 14:52:51 +01:00
1f73a97a5a
ddraw: Remove unneeded casts.
2007-12-06 12:07:41 +01:00
63f4b6f024
ddraw: DPRINTF -> TRACE.
2007-12-05 12:34:33 +01:00
3cc253c557
wined3d: Enabling too many lights is silently ignored.
...
I'm resending this patch because my reply to Henri's concern came too late.
Henri noted that I am enabling lights that do not exist. Existing tests show
that if no light is assigned to the index, LightEnable creates a light with a
set of default parameters, so the tests should be fine.
From 9ee4c61805b50886f79e87d744b52f27b7b00b4e Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan@codeweavers.com>
Date: Thu, 29 Nov 2007 13:22:47 +0100
Subject: [PATCH] WineD3D: Enabling too many lights is silently ignored
This patch adds tests for all d3d versions that show that Windows
pretends that enabling more lights than supported succeeds. D3D_OK is
returned, and the light is reported as enabled.
What is not tested in this patch is the rendering output of this
situation, thus the FIXME is still written.
2007-12-03 13:44:07 +01:00
714991bf3f
ddraw: Fix a test for Vista.
2007-11-07 12:08:07 +01:00
f9dba29477
ddraw: Be less picky about float precision.
2007-11-07 12:08:00 +01:00
0d016254a0
wined3d: Don't test D3DDEVICE surfaces in dsurface tests.
2007-11-05 13:24:36 +01:00
848650d908
ddraw: Downgrade the SetCooperativeLevel FIXME to a TRACE.
2007-10-10 11:59:33 +02:00
7a445747ea
ddraw: Do not fail on surface creation errors, skip instead.
2007-10-10 11:59:26 +02:00
c5055fb3eb
ddraw: Cope with Init3D failures.
2007-10-10 11:58:37 +02:00
03fa9f8730
ddraw: Fix RegDeleteTreeA/W compile issues when building ddraw for Windows.
2007-10-01 14:17:09 +02:00
b78736a4bb
ddraw: Remove 'recursive registry key delete' function.
2007-09-25 11:19:03 +02:00
Henri Verbeet