b4a0d47809
d3d9: Add stub for Direct3DShaderValidatorCreate9().
2007-12-18 12:32:56 +01:00
b9860a9b27
d3d9: Do not set NONE MIN and MAG filters.
2007-12-17 12:30:04 +01:00
297b88486e
d3d9: D3DLOCK_DISCARD is not valid on managed textures.
2007-12-17 12:26:09 +01:00
b060390c73
d3d9: The refrast returns an error on invalid clear rects.
2007-12-17 12:26:01 +01:00
5f7a9cea38
Assorted spelling fixes.
2007-12-07 16:35:32 +01:00
f700cbe74b
wined3d: Add an alpha blending test.
2007-12-07 16:26:43 +01:00
0e8c13e630
wined3d: A more detailed occlusion query test and fixes.
2007-12-07 15:27:11 +01:00
ad9396302d
Removed some unneeded imports.
2007-12-06 21:24:24 +01:00
f4d2449244
wined3d: Test clearing regarding the scissor test and colorwrite.
2007-12-06 13:48:43 +01:00
77c8a1594d
d3d9: Remove unneeded casts.
2007-12-05 12:04:44 +01:00
fce9abd095
wined3d: Clear honors the viewport.
2007-12-04 14:32:39 +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
0f39b29da0
wined3d: mov to a0.x does a floor(), not a round to nearest.
2007-12-03 13:43:54 +01:00
ba5c61ba20
wined3d: Fog is applied after sRGB correction.
2007-11-27 16:01:44 +01:00
02ebbd1fe5
d3d9: Add a test for vertex shader input matching.
2007-11-27 15:18:28 +01:00
22ac3704ba
d3d9: Free the converted declaration data after creating the declaration.
2007-11-20 13:10:55 +01:00
5c3151b2e7
d3d9/tests: Fix the trailing '\n' in an ok() call.
2007-11-16 12:38:27 +01:00
e4f8a2da2b
wined3d: Depth stencil fixes.
2007-11-14 11:58:36 +01:00
9f41a359b6
wined3d: Partially revert "Get rid of the conditionals in shader_glsl".
2007-11-14 11:58:22 +01:00
b4b10d8bc2
d3d9: Release the window after the visual tests.
2007-11-09 12:35:50 +01:00
4454096db2
d3d9: Be less picky in the D3DFMT_X8L8V8U8 test.
2007-11-08 12:18:30 +01:00
6209b36acb
wined3d: mov to a0.x does a floor(), not a round to nearest.
2007-11-08 11:55:31 +01:00
d2c166bbb7
d3d9: Initialize the test rectangle correctly.
2007-11-07 12:08:40 +01:00
c390b6044b
d3d9: Remove some spamy debug traces from the texture test.
2007-11-07 12:08:15 +01:00
50ea23efd6
d3d9: Use HAL devices in some tests.
2007-11-07 12:07:52 +01:00
5fc54b5459
wined3d: Shader Model 3.0 varying tests.
2007-11-07 12:03:04 +01:00
aa7f9f0a72
d3d9: Silence a FIXME.
2007-11-01 12:39:32 +01:00
393ed4a070
wined3d: Make resource memory 32 byte aligned.
2007-11-01 12:38:45 +01:00
a022e8b402
wined3d: Add a (nested) loop test.
2007-10-12 10:59:17 +02:00
3587dfeb48
d3d9: Release pixel shaders after we're done with them in the visual test.
2007-10-10 19:52:22 +02:00
6486a79e2a
d3d9: Do not rely on CreateVertexShader failing.
2007-10-09 12:31:36 +02:00
700c602eb6
d3d9: Fix crash in texture test.
2007-10-09 12:31:32 +02:00
4a31362d53
d3d9/tests: Initialize shader to NULL.
2007-10-03 11:01:47 +02:00
4c51db896c
wined3d: Check for NULL streams.
2007-09-20 15:53:19 +02:00
02114ac21f
wined3d: The D3DSI_COISSUE flag changes the behavior of cnd.
2007-09-14 14:26:26 +02:00
c96236ff3e
wined3d: Add a test for the cnd instruction.
2007-09-14 14:26:08 +02:00
7248354067
wined3d: Pixel shader 1.x constants are clamped to [-1;1].
2007-09-14 14:23:45 +02:00
160258b637
wined3d: Implement mipmap auto generation.
2007-09-12 12:10:25 +02:00
41bf0d48db
wined3d: Fix WINED3DFMT_X8L8V8U8.
2007-09-11 13:48:15 +02:00
422e0ba1cc
wined3d: texkill ignores the .w only in ps 1.x.
2007-09-11 13:48:08 +02:00
a006d2568b
wined3d: Fix texdepth instruction.
2007-09-11 13:47:49 +02:00
a305af0b30
wined3d: Fix the z range.
2007-09-11 13:47:36 +02:00
d0fdb1ea7e
d3d: Add a test for double surface locking.
2007-08-31 11:25:19 +02:00
a116879507
Assorted spelling fixes.
2007-08-30 12:26:02 +02:00
4438b3be06
wined3d: Texture transform flag test.
2007-08-27 18:28:48 +02:00
cc563b9c69
d3d9: Return the correct return value in GetDepthStencilSurface.
2007-08-27 12:00:28 +02:00
04d62b4322
wined3d: fogstart == fogend means full fog.
2007-08-21 13:35:48 +02:00
01c6c982bb
d3d9: Some caps fixes.
2007-08-21 13:35:35 +02:00
86b991c851
wined3d: Fix R32F and R16F.
2007-08-17 12:01:38 +02:00
b220905e4a
wined3d: Reinstall the internal reference on the current index buffer.
2007-08-16 11:35:06 +02:00
a06e002e93
wined3d: Add a wined3d private WINED3DSBT_RECORDED.
2007-08-15 09:36:20 +02:00
427723cc37
d3d9: Comment out some failing fog tests.
2007-08-08 15:32:03 +02:00
2d15cb8b27
d3d: Add a simple offscreen rendering test.
2007-08-08 15:32:00 +02:00
dbd338c018
wined3d: WINED3DSAMP_MAXMIPLEVEL fixes.
2007-08-06 12:05:39 +02:00
9ae22f1a76
d3d9: Do not fail if d3d9 is not available.
2007-08-06 12:05:31 +02:00
39a8f1b2a4
d3d9: Deal with failing surface creation.
2007-08-06 12:04:58 +02:00
17fe57e212
d3d9: Check for volume texture support before running the volume test.
2007-08-03 12:30:58 +02:00
878414a5e6
d3d9: Some visual test fixes.
2007-08-03 12:30:52 +02:00
4194d784f8
d3d9: Trace the Format parameter to IDirect3DDevice9Impl_CreateTexture as hexadecimal.
2007-07-26 11:51:26 +02:00
7a8455094d
d3d9/tests: Fix use of uninitialized variable (Coverity).
2007-06-25 13:23:50 +02:00
e84158f510
d3d9: Hold the lock in VertexShader methods.
2007-06-25 11:35:40 +02:00
57acd1d9a6
d3d9: Hold the lock in VertexDeclaration methods.
2007-06-25 11:35:24 +02:00
d9583c6c58
d3d9: Hold the lock in Vertexbuffer methods.
2007-06-25 11:35:09 +02:00
99a3d76e8d
d3d9: Hold the lock in Texture methods.
2007-06-25 11:34:58 +02:00
ef5e5300e3
d3d9: Hold the lock in swapchain methods.
2007-06-22 13:43:11 +02:00
35c5c4528f
d3d9: Hold the lock in suface methods.
2007-06-22 13:43:05 +02:00
80f792f350
d3d9: Hold the lock in stateblock methods.
2007-06-19 12:34:15 +02:00
9570cd5be4
d3d9: Release the wined3d query when the d3d9 query is destroyed.
2007-06-19 12:34:03 +02:00
c0cc0f1062
d3d9: Hold the lock in query methods.
2007-06-19 12:33:56 +02:00
5194ce1972
d3d9: Hold the lock in Pixelshader functions.
2007-06-18 12:33:55 +02:00
896568f209
d3d9: Hold the lock in indexbuffer methods.
2007-06-18 12:33:55 +02:00
ea3076b0f7
d3d9: Hold the lock in cubetexture methods.
2007-06-18 12:33:55 +02:00
0820777983
d3d9: Hold the lock in methods implemented in device.c.
2007-06-18 12:33:54 +02:00
66821059b4
d3d9: Hold the lock in IDirect3D9 methods.
2007-06-18 12:33:54 +02:00
c4b801b7d1
d3d9: Add a dll global critical section.
2007-06-14 13:23:04 +02:00
078523f73e
wined3d: Present does not clear the depth stencil.
2007-06-14 13:22:19 +02:00
6ee356fca0
wined3d: Get rid of the pBaseVertexIndex parameter to IWineD3DDeviceImpl_GetIndices, use GetBaseVertexIndex instead.
2007-06-07 11:20:48 +02:00
785771272a
wined3d: Get rid of the BaseVertexIndex parameter to IWineD3DDeviceImpl_SetIndices, use SetBaseVertexIndex instead.
2007-06-06 12:10:47 +02:00
b70bc73196
d3d9: Add a test for calling DrawIndexedPrimitive with a NULL index buffer.
2007-06-04 12:58:42 +02:00
e6196f9ae7
d3d9/tests: Fix the Visual C++ double to float conversion warnings.
2007-05-29 13:47:01 +02:00
fd578240f2
d3d9/tests: Fix compilation with Visual C++ 2005.
2007-05-29 12:12:41 +02:00
d476313a49
direct3d: Remove misspelled constants as they exist correctly spelled.
2007-05-21 12:38:54 +02:00
5c48d504fc
wined3d: Destroying the resource frees all private data.
...
Also adds a test for ddraw, d3d8 and d3d9.
2007-05-11 11:22:31 +02:00
1316b7f5e4
d3d9: Add a surface locking test.
2007-05-04 13:41:21 +02:00
94b3fddec8
d3d: Pass the cube face to Create*Texture's surface creation callback.
2007-05-01 11:42:25 +02:00
5a8fc34033
Assorted spelling fixes.
2007-04-30 12:35:11 +02:00
460f71dcf8
d3d: Fix ProcessVertices.
...
IDirect3DDevice9::ProcessVertices takes a vertex declaration, not a
vertex buffer. The source for ProcessVertices is taken from the
stateblock, not the vertex declaration.
2007-04-26 14:54:29 +02:00
71fe9ae7da
d3d9/tests: Fix fog with shader test.
2007-04-23 13:55:35 +02:00
725f4bfeb1
d3d9: Rework the converted vertex declaration management.
...
Instead of creating a converted declaration each time SetFVF is
called, exactly one declaration is created for each FVF(on demand) and
stored for the lifetime of the device. This avoids memory leaks and
makes keeping track of converted declarations easier. Wether a
declaration is converted from a fvf or not is now a static information
inside the declaration. Those declarations are not destroyed in
VertexDeclaration::Release, they stay for the lifetime of the
device. This keeps us free from tracking the declaration through
stateblocks
2007-04-18 13:13:45 +02:00
7cee0b2ed0
d3d9: Do not allow Direct3D9::GetAdapterModeCount to be called with D3DFMT_UNKNOWN.
2007-04-17 11:21:13 +02:00
725057da47
d3d: Remove dependency on ddraw.h header.
2007-04-16 13:20:15 +02:00
8a5b6df483
d3d: Enumerate palettized formats for ddraw.
2007-04-16 12:12:34 +02:00
c4eb3de8d8
d3d9: Fix vertex decl test.
2007-04-13 11:42:24 +02:00
9580c3f6c3
d3d9: Add a test for the converted vertex decl.
2007-04-12 16:11:39 +02:00
46c5d223ff
d3d9: Break out two helper functions from test_fvf_to_decl.
2007-04-12 16:11:13 +02:00
35dd693a79
d3d9: Fix the circular converted vertex declaration reference.
2007-04-12 16:10:48 +02:00
2db7691ec8
d3d9: AddRef the device in IDirect3DVertexDeclaration9::AddRef.
2007-04-12 16:09:23 +02:00
43155227d6
d3d9: Void functions should not return a value.
2007-04-09 12:15:42 +02:00
290f2eb146
wined3d: Add Filtering to IWineD3DSurface::Blt and handle it.
...
This is to allow StretchRect to pass the texture filter to WineD3D.
DirectDraw sets the texture filter to WINED3DTEXF_NONE, simmilar to all
other functions which do not need filtering.
2007-04-07 10:58:10 +02:00
c343fb1cdf
wined3d: Make CreateCubeTexture fail when not supported.
2007-04-02 11:28:39 +02:00
76d153144f
d3d9/tests: Add test for texbem instruction.
2007-03-23 12:32:30 +01:00
7b31e91291
d3d9/tests: Add test for fog with shader.
2007-03-23 12:31:13 +01:00
022e884342
wined3d/ddraw: Forward DDSCL_MULTITHREADED to wined3d.
2007-03-19 12:17:18 +01:00
01199072dd
wined3d: Fix LockRect memory location calculation for WINED3DFMT_DXT*.
2007-03-17 19:51:34 +01:00
1283772a26
d3d9: Add a LockRect test for DXTn formats.
2007-03-16 11:20:42 +01:00
fd64779fd0
d3d9: Add a cubemap wrapping test.
2007-03-16 11:20:08 +01:00
4b445124d3
direct3d: Add a fixed function fog test.
2007-03-15 12:14:50 +01:00
e343652338
d3d9/tests: Use skip as is done in the other tests.
2007-03-12 12:21:53 +01:00
26344ce3f2
d3d9: Add a mova rounding test.
2007-03-07 11:52:26 +01:00
5f159452ef
wined3d: Clearing the depth stencil buffer fails without a depth stencil buffer.
2007-03-06 22:17:03 +01:00
4a16dbbbec
wined3d: More Clear fixes.
...
Test for rectangles with x1 > x2 and y1 > y2. Empire earth passes such rects.
2007-02-27 12:20:10 +01:00
969dc6a7ef
d3d9: Free the vertex declaration elements.
2007-02-26 13:57:59 +01:00
dd93e1fb7f
wined3d: Floating point shader constant setting.
...
Test how shader constant limits are checked in Set*ShaderConstantF.
The vertex shader tests it based on the limits reported in the caps,
the pixel shader tests tries to find the limit manually because I
could not find a cap structure member specifying the pixel shader
constant limit.
Set*ShaderConstantF returns an error as soon as start or start + count
are bigger than the constant limit.
2007-02-21 10:56:01 +01:00
93494f2ac0
Assorted spelling fixes.
2007-02-20 20:30:51 +01:00
bbcf98209c
wined3d: No bounds checking is done on sampler / texture numbers.
2007-02-20 11:49:42 +01:00
266fc77cf0
wined3d: Lighting is calculated for vertices without normals.
...
It still should be disabled for transformed vertices though.
2007-02-19 13:08:35 +01:00
03bc11fa16
wined3d: Visual test framework.
2007-02-19 13:07:44 +01:00
a4bc52a89c
wined3d: Fix WINED3DPRESENT_PARAMETERS and use it instead of D3DPRESENT_PARAMETERS.
2007-02-16 12:31:03 +01:00
a41ba013b6
wined3d: Test for supported queries.
...
This test contains a table of known supported / known unsupported
queries. In theory wined3d could just report the queries it supports,
but applications may make some assumtions regarding supported /
unsupported queries and stop working if they find a query unexpectadely
supported or unsupported. It also tests what is supposed to happen if an
unsupported query is created.
2007-02-15 17:21:58 +01:00
7f5dccb696
wined3d: Properly release the converted vertex declaration.
2007-02-14 20:46:39 +01:00
dea795f7ac
d3d9: Don't store the d3d9 declaration in the wined3d object.
2007-02-14 13:54:42 +01:00
b48dfb3c54
wined3d: Always use np2 repacking if no native np2 support is available.
2007-02-14 12:29:01 +01:00
f196680c59
wined3d: GetRenderTargetData can call BltFast.
2007-02-14 12:27:37 +01:00
67b1f4a7e9
wined3d: BeginScene and EndScene tests and fixes.
2007-02-12 12:08:34 +01:00
d4ca34dd9b
d3d: Fix the D3DFMT_XXX constant declarations.
2007-01-18 12:05:05 +01:00
8658d20b3e
wined3d, d3d9: Caps correction.
2007-01-15 12:44:03 +01:00
cb74603e43
d3d9: Implement IDirect3DDevice9::StretchRect.
2007-01-12 11:49:38 +01:00
354b9e7aae
d3d9/tests: Warn that tests were skipped if we could not load d3d9.dll.
...
But report a failed test if a mandatory function is missing from it.
Also warn if the hardware capabilities force us to skip some tests.
2007-01-12 11:25:24 +01:00
3ba0e7b01b
d3d9/tests: Replace some '#if 0's with 'if (0)'s.
2007-01-08 12:08:58 +01:00
590bca8425
d3d9: Declare some functions static.
2007-01-04 21:14:05 +01:00
71631f7638
wined3d: Use the baseVertexIndex in the stateblock.
2007-01-03 11:02:51 +01:00
c1cc17d827
d3d9: Fix failing tests on windows, when no 3d hardware acceleration is available.
2007-01-02 13:24:08 +01:00
7d1f36aa1c
d3d9/tests: Avoid sizeof in traces.
2006-12-29 12:49:43 +01:00
b7b9d4e3c7
d3d: GetStreamSource on a stream with NULL data isn't an error.
2006-12-26 12:52:54 +01:00
ed21935479
d3d: Fix adapter mode enumeration and filtering.
2006-12-20 17:58:34 +01:00
d80dc79280
d3d9: Handle volume container in d3d9.
2006-12-18 12:08:08 +01:00
467b1dd3ad
d3d9: Handle surface container in d3d9.
2006-12-18 12:08:02 +01:00
73b5fb059f
d3d9: Fix implicit swap chain refcounting.
2006-12-18 12:07:38 +01:00
5e0fc62135
d3d: Callback infrastructure for implicit swap chain destruction in IWineD3DDevice.
2006-12-18 12:07:26 +01:00
f9f3ec2f00
d3d9: Fix implicit surface refcounting.
2006-12-18 12:07:09 +01:00
63e23995bc
d3d9: Handle volume refcount forwarding in d3d9.
2006-12-18 12:02:06 +01:00
04dcffe393
d3d9: Handle surface refcount forwarding in d3d9.
2006-12-18 12:01:58 +01:00
d30f1527cc
wined3d: Implement IWineD3DDevice::Reset.
2006-12-11 12:40:13 +01:00
3fd04308ab
d3d: Callback infrastructure for implicit depth stencil surface destruction in IWineD3DDevice.
2006-12-06 12:39:30 +01:00
a60d4b2d2f
d3d: Pass the superior creating object down to the callback functions.
2006-12-04 12:40:38 +01:00
81c7c00bb2
wined3d/d3d9: Pitch for DXTn textures can not be 0. With tests.
2006-12-04 12:38:16 +01:00
dc0afe4242
d3d9: Remove unreachable return.
2006-12-01 13:16:12 +01:00
61087377a0
d3d9: Use correct COM macros.
2006-12-01 12:27:15 +01:00
bd072332e1
Revert "d3d: Remove AddRef from IWineD3DDevice_GetDirect3D.".
...
This reverts commit 167b83c28a
2006-11-30 16:04:00 +01:00
f8e7ddd798
Revert "d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.".
...
This reverts commit 478a414e58
2006-11-30 16:04:00 +01:00
b657cd5f58
Revert "d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.".
...
This reverts commit a7518f6f54
2006-11-30 16:04:00 +01:00
f5204b8afe
Revert "d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.".
...
This reverts commit 18546a65e6
2006-11-30 16:04:00 +01:00
5bec2f57a1
Revert "d3d: Remove AddRef from IWineD3DDevice_GetTexture.".
...
This reverts commit 274df6ef88
2006-11-30 16:04:00 +01:00
3a270375d7
Revert "d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.".
...
This reverts commit 16b1e046d8
2006-11-30 16:03:59 +01:00
9dd81f64cb
Revert "d3d: Remove AddRef from IWineD3DDevice_GetIndices.".
...
This reverts commit 5c4008719c
2006-11-30 16:03:59 +01:00
c40501db50
Revert "d3d: Remove AddRef from IWineD3DDevice_GetSwapChain.".
...
This reverts commit f84f687e6d
2006-11-30 16:03:59 +01:00
f84f687e6d
d3d: Remove AddRef from IWineD3DDevice_GetSwapChain.
2006-11-22 11:40:50 +01:00
5c4008719c
d3d: Remove AddRef from IWineD3DDevice_GetIndices.
2006-11-22 11:40:43 +01:00
16b1e046d8
d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.
2006-11-22 11:40:37 +01:00
274df6ef88
d3d: Remove AddRef from IWineD3DDevice_GetTexture.
2006-11-22 11:40:31 +01:00
18546a65e6
d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.
2006-11-22 11:40:24 +01:00
a7518f6f54
d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.
2006-11-22 11:40:05 +01:00
478a414e58
d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.
2006-11-22 11:39:52 +01:00
167b83c28a
d3d: Remove AddRef from IWineD3DDevice_GetDirect3D.
2006-11-22 11:39:39 +01:00
46dd467941
d3d9: Include wingdi.h, not gdi.h.
2006-11-17 12:46:15 +01:00
b9807c2a3b
d3d9: Forward port d3d8 refcount tests.
2006-11-16 12:48:52 +01:00
2c40b823e1
d3d9: Forwardport implicit surface tests.
2006-11-10 11:36:41 +01:00
9b74d76214
d3d9/tests: Add refcount test for binding objects.
2006-11-04 11:57:36 +01:00
2d8aed6b03
d3d9: Make the "Tests executed" counter stable.
2006-10-30 11:38:03 +01:00
3160ad76f7
d3d9: Pass test as argument to print handler.
2006-10-30 11:37:29 +01:00
3ac7720f05
d3d9: Cast-qual warnings fix.
2006-10-30 11:20:14 +01:00
22288de732
Fix compilation with gcc 2.95.
2006-10-19 13:35:19 +02:00
58162f87fd
Assorted spelling fixes.
2006-10-13 11:55:04 +02:00
9628a1b2e2
wined3d: Merge D3DRECT types into one type in WINED3D namespace.
2006-10-12 12:37:08 +02:00
ac37163124
wined3d: Merge D3DMATRIX types into one type in WINED3D namespace.
2006-10-12 12:35:00 +02:00
732e0e908b
wined3d: Merge GAMMARAMP types into one type in WINED3D namespace.
2006-10-11 12:22:01 +02:00
5f2987ae32
wined3d: Merge VIEWPORT types into one type in WINED3D namespace.
2006-10-11 12:21:54 +02:00
90f5be2bef
wined3d: Merge MATERIAL types into one type in WINED3D namespace.
2006-10-11 12:21:14 +02:00
70bbf734b1
wined3d: Merge LIGHT types into one type in WINED3D namespace.
2006-10-11 12:21:06 +02:00
93ec41fd9a
d3d9: Disable the surface pitch size test for now, just check alignment instead.
2006-10-11 12:08:24 +02:00
cb4ad6e52c
d3d9: Win64 printf format warning fixes.
2006-10-10 19:59:09 +02:00
365852c083
d3d9/tests: Printf format fixes for d3d9 tests.
2006-10-09 20:26:09 +02:00
1eea5c2119
d3d9/tests: Make d3d9 tests Wcast-qual compliant.
2006-10-09 20:25:39 +02:00
8f21b6f682
d3d9/tests: Remove unused device parameter.
2006-10-09 20:24:11 +02:00
401835fcb7
d3d9/tests: Add init/teardown handlers for state tests.
2006-10-09 20:23:59 +02:00
cbfc4090d4
d3d9/tests: Clean up get/set handler arguments.
2006-10-09 20:23:20 +02:00
3529560cd7
wined3d: Add WINED3DUSAGE_OVERLAY.
2006-10-06 12:53:24 +02:00
82babbee0b
Add missing '\n's to Wine traces.
2006-10-05 17:46:48 +02:00
836cf139bb
d3d9: Fix typo in trace.
2006-10-05 11:31:56 +02:00
2c82c707da
d3d9: Tweak a buffer declaration to fix the compilation with Visual C++.
2006-10-02 11:54:49 +02:00
85ce5117c5
Add a WINE_NO_LONG_INT define to many makefiles to ease the transition of DWORD/LONG/ULONG from long to int.
2006-09-29 16:08:30 +02:00
dba338f2e6
d3d9/tests: Don't test texture states beyond the supported maximum.
2006-09-27 20:53:01 +02:00
0ffe5a34c6
d3d9: Remove no longer used imports.
2006-09-26 20:01:39 +02:00
9cafbd6de0
wined3d: Surface data is 32 bit aligned.
2006-09-25 18:31:26 +02:00
32ab895e46
makefiles: Generate the dependencies line to avoid some code duplication.
2006-09-14 09:38:16 +02:00
5cf75e615a
makefiles: Only run test and documentation targets in directories that need them.
2006-08-28 13:37:44 +02:00
30ef7f0b08
wined3d: Minor cursor fixes.
2006-08-10 10:54:37 +02:00
6128a05071
d3d9: Stub D3DPERF_ functions.
2006-08-07 19:59:53 +02:00
7ac5bd67d5
d3d: Don't crash when SetRenderTarget() is called with a NULL pSurface.
2006-08-07 13:12:37 +02:00
2783e72a65
Fix 2 "static is not at beginning of declaration" warnings.
2006-07-28 12:33:56 +02:00
84d6bd0469
d3d9: State management test framework for d3d9.
2006-07-21 10:55:23 +02:00
77dc0d9be5
.gitignore: Added wildcards to ignore generated resource files.
2006-07-10 21:39:00 +02:00
0fa8baafcb
make_dlls: Recursively ignore .ok files in all tests directories.
2006-07-10 21:26:50 +02:00
edd100b899
make_dlls: Recursively ignore testlist.c in all tests directories.
2006-07-10 21:19:42 +02:00
5258e061dc
make_dlls: Ignore generated import libraries from the top-level .gitignore.
2006-07-10 20:55:58 +02:00
cc2b3b48e6
Take advantage of the recursive nature of .gitignore for Makefile entries.
...
Prefix other entries with '/' to make them non-recursive.
2006-07-10 20:47:54 +02:00
1309844913
wined3d: Implement FVF to DECL9 conversion (with tests).
2006-07-06 16:07:38 +02:00
9eb81363ad
Add trailing '\n's to ok() calls.
...
Remove spaces before '\n'.
2006-06-16 11:32:42 +02:00
11ae0f6386
Assorted spelling fixes.
2006-06-16 11:32:29 +02:00
3c688e9345
d3d9: Remove ValidatePixel/VertexShader.
2006-06-16 11:30:38 +02:00
7b27b33495
d3d9: Remove dependencies on OpenGL headers and libraries.
2006-06-15 16:52:01 +02:00
3862f8e3d7
wined3d: Support more than one back buffer.
2006-06-15 16:51:41 +02:00
4374328271
d3d9: Don't use sizeof in traces to avoid printf format warnings.
2006-06-13 14:09:46 +02:00
3a91a4a274
d3d9: Make some test functions static.
2006-06-12 13:21:47 +02:00
c30d4ecd81
d3d9: Make the virtual table functions static where possible.
2006-06-10 11:51:05 +02:00
773309a403
d3d9: Add a test for default texture stage state values.
2006-06-09 21:06:54 +02:00
5eaf49f895
d3d9: Add a test for GetContainer (Volumes & Surfaces).
2006-06-07 15:37:30 +02:00
07a3173bee
d3d9: Remove unused vshaderdeclaration.c.
2006-06-07 15:28:25 +02:00
34e2e2bd39
d3d9: Fix QueryInterface.
...
QueryInterface should return S_OK on success and set the object
pointer to NULL on failure. This is similar to the patch Ivan
submitted a while ago for wined3d.
2006-06-07 15:28:12 +02:00
5bb0eebc95
d3d9: Test missing light recording.
...
When a light does not exist, and the app attempts to capture it in the
stateblock, a disabled light with the default light parameters is
written instead.
2006-06-07 15:16:25 +02:00
374de452ab
d3d9: Mipmaps level test.
2006-06-07 15:16:16 +02:00
88528a7839
d3d9: Add a test for setting / getting vertex shader constants.
2006-06-07 11:47:38 +02:00
19d19b2b79
d3d9: Add reference to the parent device for surfaces.
...
Allow some objects to have no parent device.
Tighten refcount tests and test refound decrement on Release.
2006-05-30 12:34:22 +02:00
46047402a3
wined3d: Create stub for D3DPERF_SetOptions function.
2006-05-26 12:06:56 +02:00
5eeead1fd7
d3d9: StateBlock is also created in EndStateBlock. With tests.
2006-05-25 10:34:41 +02:00
e902cd119f
wined3d: Swapchain and back buffer corrections + tests.
2006-05-24 13:56:55 +02:00
360a3f9142
Update the address of the Free Software Foundation.
2006-05-23 14:11:13 +02:00
4054c06e55
directx: Update file versions to dx9c (compared to win2k).
2006-05-22 11:32:17 +02:00
c5091d9d8d
d3d9: Add refcount tests for all objects created by device.
2006-05-22 11:32:03 +02:00
6dcae77cc9
d3d9: All objects created by device should keep reference to it.
2006-05-22 11:31:45 +02:00
f7c24f37ad
Various trace fixes.
...
Add trailing '\n's to trace calls.
Remove spaces before '\n'.
2006-05-15 15:05:09 +02:00
d04f0507cf
wined3d: Implement Init3D and Uninit3D.
2006-04-19 12:43:22 +02:00
03b256b16d
wined3d: Add a parameter for surface type selection.
2006-04-18 11:09:17 +02:00
ffc8e46e76
wined3d: Add IWineD3DSurface::Blt.
2006-04-17 11:19:30 +02:00
d2510847b0
wined3d: Split device creation and opengl initialization.
2006-04-13 11:22:45 +02:00
4a25828c0d
d3d9: VertexDeclaration and VertexShader should keep reference to the parent device object.
2006-04-12 11:20:21 +02:00
88a7c9e948
wined3d: Downgrade some FIXMEs.
2006-04-10 12:23:45 +02:00
cfb6b282d8
d3d9: Add typecasts for WINED3DLOCKED_BOX to avoid compiler warnings.
2006-04-08 19:59:54 +02:00
cf4b91f074
wined3d: Add WINED3DBOX to wined3d_types.h.
2006-04-07 14:55:50 +02:00
bbe490abcc
wined3d: Add WINED3DLOCKED_RECT to wined3d_types.h.
2006-04-06 22:23:31 +02:00
63fd9a7a98
wined3d: Add WINED3DTEXTUREFILTERTYPE to wined3d_types.h.
2006-04-06 22:22:35 +02:00
be720179b6
wined3d: Add WINED3DCUBEMAP_FACES to wined3d_types.h.
2006-04-04 20:01:10 +02:00
c289b3cc51
wined3d: Define WINED3DGAMMARAMP based on D3DGAMMARAMP / DDGAMMARAMP.
2006-04-04 20:00:41 +02:00
08c38a87e1
wined3d: Add WINED3DRASTERSTATUS to wined3d_types.h.
2006-04-04 11:51:37 +02:00
f6ed704f96
wined3d: Make use of WINED3DDEVICE_CREATION_PARAMETERS.
2006-04-03 21:35:44 +02:00
fc13420770
d3dx: VertexBuffer should keep reference to the parent device object.
2006-04-03 14:14:24 +02:00
0ad31f819d
wined3d: Add WINED3DBACKBUFFER_TYPE to wined3d_types.h.
2006-04-03 12:17:35 +02:00
fce54bcc49
wined3d: Add WINED3DDISPLAYMODE to wined3d_types.h.
2006-04-03 12:17:22 +02:00
6a8578f847
wined3d: Add WINED3DDEVTYPE to wined3d_types.h.
2006-03-30 12:45:57 +02:00
1d47556195
wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code.
2006-03-28 17:51:45 +02:00
d75fd75d48
wined3d: Add WINED3DPOOL to wined3d_types.h.
2006-03-28 17:34:42 +02:00
b4b295c2a5
wined3d: Add WINED3DMULTISAMPLE_TYPE to wined3d_types.h.
2006-03-27 11:30:49 +02:00
0f7eb52789
wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h.
2006-03-27 11:30:49 +02:00
6af24c816d
wined3d: Rectpatch code fix.
...
Update the wined3d code to use WINED3DRECTPATCH_INFO, which was added
with an older patch.
2006-03-24 12:13:50 +01:00
6cc87406cf
wined3d: Add WINED3DINDEXBUFFER_DESC to wined3dtypes.h.
2006-03-15 11:30:39 +01:00
9f46792ba2
wined3d: Add WINED3DVERTEXBUFFER_DESC to wined3d_types.h.
2006-03-13 13:32:01 +01:00
913df5b143
wined3d: Consistently use WINED3DRESOURCETYPE.
2006-03-10 21:43:00 +01:00
6104c67613
wined3d: Use WINED3DPRESENT_PARAMETERS in IWineD3DSwapChain::GetPresentParameters.
2006-03-09 12:51:26 +01:00
07004966a8
wined3d: Fix the relation between volumes and their container.
2006-03-06 20:08:36 +01:00
f7356a34c3
wined3d: Fix the relation between surfaces and their container.
2006-03-06 20:08:22 +01:00
339a4dbd5b
d3d: Fix Validate(Pixel|Vertex)Shader() prototypes.
...
Fix Validate(Pixel|Vertex)Shader() prototypes so they match the spec file.
Fix the stub message so it is more standard and use consistent
parameter names.
2006-03-03 13:17:20 +01:00
75ac954cf5
d3d9: Use an invisible window for tests.
2006-02-10 14:52:10 +01:00
9aa0d88c95
d3d9: Add a test for IDirect3DVertexDeclaration9_GetDeclaration.
2006-02-07 12:27:23 +01:00
d8d70370dd
d3d9: Reorganise the vertexdeclaration tests.
...
- Split the test for getting and setting vertexdeclaration into one
for creating the declaration and one for the actual getting and
setting.
- Add traces for when creating the device or vertexdeclaration fails.
2006-02-07 12:26:59 +01:00
b994d057ac
wined3d/d3d9: Cleanup GetContainer for volumes.
2006-02-07 12:26:10 +01:00
2200f3e2ca
wined3d/d3d9: Cleanup GetContainer for surfaces.
2006-02-07 12:25:59 +01:00
2bb87a90b2
d3d9: Add traces for when shader support is missing in the shader test.
2005-12-21 20:45:07 +01:00
636cb19ad0
d3d9: Don't crash on NULL device_ptr.
2005-12-19 10:00:08 +01:00
27462d1d40
d3d9: Don't treat missing d3d9.dll as a failure.
2005-12-15 10:25:06 +01:00
fa40b77ad7
d3d9: Add a test for Get/SetVertexDeclaration refcounts.
2005-12-14 11:29:38 +01:00
0a0e948b28
d3d9: Check for a NULL shader in IDirect3DDevice9Impl_GetVertexShader
...
before getting the parent.
2005-12-14 11:29:05 +01:00
9a1bc10f5d
d3d9: Don't treat missing d3d9.dll as a failure.
2005-12-14 10:50:52 +01:00
510c94d2d5
d3d9: Add a test for Get/SetVertexShader and Get/SetPixelShader refcounts.
2005-12-13 12:00:25 +01:00
c26ad82e75
d3d9: Add a test for BeginStateBlock and EndStateBlock.
2005-12-09 14:53:28 +01:00
7c482cb9a1
wined3d: Vertex shader 8 support.
...
Start to add support for DirectX 8 vertex shaders, constants and
registers are now correctly assigned and loaded allowing support for
most basic d3d8 shaders.
2005-12-09 11:23:52 +01:00
0ec7e1a591
Renamed all .cvsignore files to .gitignore.
2005-11-26 13:10:33 +01:00
58fdd892c6
Remove the setting of the result pointer to NULL in creates, tests
...
show that windows doesn't set the result to NULL on error.
2005-11-14 11:21:46 +00:00
0edbaf7e80
Remove spaces before '\n' in traces.
2005-11-10 12:14:56 +00:00
2adb302a99
Add trailing '\n's to ok() and TRACE() calls.
2005-11-10 11:17:38 +00:00
5a48acc660
Allow NULL ppQuery to be passed to CreateQuery.
2005-11-08 12:46:21 +00:00
9970133f2b
In case of D3D9 the CreateQuery call can be used to retrieve status
...
information. According to MSDN the 'ppQuery' parameter can be set to
NULL to detect if a certain query Type is supported.
2005-10-31 09:59:56 +00:00
7e22be4d84
We are no longer generating .dbg.c files.
2005-09-29 10:35:58 +00:00
6ccb80d9a5
Documentation tweaks to make winapi_check happy.
2005-09-26 09:52:56 +00:00
cd159e3a74
Tidy up d3d9 and finalize passing d3d9 calls to wined3d for now.
2005-08-23 09:34:57 +00:00
d252fe6439
Fix pointer type warnings.
2005-08-18 11:45:29 +00:00
e403237f47
Pass all the d3d9 calls onto their wined3d equivalents.
2005-08-18 11:45:17 +00:00
8955ac43a3
gcc 4.0 -Wpointer-sign fixes.
2005-07-28 10:16:21 +00:00
7cb748fed2
Makes sure any internal reference counting is passed onto the parent,
...
any objects referenced by the internal stateblock are released when
the stateblock is released (we don't reference count while a
stateblock is recording, so recorded stateblocks have no references to
clean up).
2005-07-26 18:49:30 +00:00
13621056db
Move parameters relating to opengl on the surface structure on to a
...
glDesciption member.
Removed Level and Target from LoadTexture, and reduced the dependency
on surface->device.
Fixed a couple of compiler warnings in d3d9.
2005-07-11 20:38:27 +00:00
28dc5a8afc
Assorted spelling fixes.
2005-07-11 10:59:41 +00:00
efbd3ac9e2
Relay all the pixel shader calls from d3d9 to wined3d.
2005-07-08 11:29:21 +00:00
3b0b430824
Added support for vertex declarations to wined3d, it's the last patch
...
to give wined3d basic functionality.
2005-07-07 20:45:39 +00:00
8a6799d47d
Implement render targets using either textures, swapchains or
...
standalone surfaces.
2005-07-07 20:35:05 +00:00
b9786d5c7c
Strip out stateblocks from d3d9 and relay all stateblock calls to
...
wined3d.
2005-07-05 16:17:31 +00:00
111445b944
Check for a null surface returned from CreateSurface.
...
Relay GetCreationParameters call to wined3d.
2005-07-01 19:15:42 +00:00
809edabfbe
Const correctness fixes.
2005-06-27 09:53:46 +00:00
46e7c30a71
Implement swapchains.
2005-06-23 11:05:24 +00:00
0ce74f54fe
Call wined3d for GetDirect3D instead of using the ->direct3D instance,
...
which is no longer valid.
2005-06-21 20:04:07 +00:00
e70e3ba0ff
Change the way caps are sent between d3d9/d3d8 and wined3d to make it
...
easier for wined3d to support additional versions of Direct3D.
2005-06-17 09:59:03 +00:00
93fefdf452
Disable the creation of invalid vertex declarations in d3d9 preventing
...
some applications from crashing.
2005-06-16 20:37:22 +00:00
2708871628
Added relay tracing to texture.
2005-06-16 20:36:12 +00:00
4625628e67
Make some of the OLE interface vtables const.
2005-05-27 20:17:35 +00:00
34fa35dc99
Added rules for building import libraries in the individual dll
...
makefiles, and added support for building a .def.a static import
library too.
2005-05-09 14:42:30 +00:00
d62356aa1e
Added rules to build import libraries in the individual dll makefiles.
...
Generate import libraries with the right name right away instead of
using an intermediate .spec.def file.
2005-05-07 12:39:52 +00:00
c3116c5e61
Renamed ttydrv and x11drv to winetty.drv and winex11.drv respectively
...
to follow the namespace conventions and make it clear that they are
drivers and not dlls.
Moved the graphics driver configuration to HKLM\Software\Wine\Drivers.
2005-05-06 19:38:50 +00:00
67f2ad4563
- Volume now inherits Resource. This isn't the way Microsoft implements
...
the interface but it is more correct way (Microsoft even have a
resource type of volume).
- Moved usage, format, allocatedMemory and size onto the resource
class structure.
- Refactored Preload for classes that inherit BaseTexture, preload now
binds the texture instead of bind texture calling preload, bindTexture
allocated a glTexture if there isn't one.
- Added two new class static members BaseTexture_CleanUp and
Resource_CleanUp that should be called by classes that implement
BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
93416cdaf7
Assorted spelling fixes.
2005-03-23 13:15:18 +00:00
8435f6f058
Change AddRef in queryInterface to IUnknown_AddRef.
...
Move ppVoulme to d3d9voloumeimpl structure.
Some minor stylistic changes (making everything the same).
2005-03-11 10:25:30 +00:00
7b261656fd
Added a stubbed out version of query to d3d9 and wined3d.
...
Update the d3d9 headers and creates wined3d types where d3d9 and d3d8
are incompatible.
2005-03-03 13:57:15 +00:00
16e8689008
Implemented guids for wined3d.
2005-03-02 13:44:58 +00:00
2121f7831e
Put all the stubs in wined3d in place, with some functionality copied
...
across from d3d9.
Make sure all d3d9 device function call their wined3d counterpart (or
perform a function).
2005-03-02 12:16:10 +00:00
8efb8794e8
Check that ppZStencilSurface is not null.
2005-02-10 20:25:20 +00:00
1226e72bf7
- add vertex Declaration support (using wined3d)
...
- minimal impl for SetRenderTarget and CreateQuery (needed to get
some samples working)
- remove no longer needed #undef GL_VERSION_1_4
2005-01-28 14:03:32 +00:00
7a49e82dac
- use Interlocked* functions in AddRef and Release.
...
- store the result of the Interlocked functions and use only this.
2005-01-24 11:31:45 +00:00
33025b203c
- Handle failures to allocate storage more gracefully.
...
- Only prototype the interfaces which are subclassed (I overdid it
last time!).
- Implement Get/Set Texture and GetBackBuffer, plus device's
GetDisplayMode / GetDeviceCaps.
- Make some of the d3d9 skeleton code issue fixme's to highlight code
which hasn't been migrated yet.
- Correct the d3d9 headers for D3DSURFACE_DESC which caused stack
corruption in demos.
2005-01-18 11:42:29 +00:00
bcecddc084
- Add texture support for all the texture types for d3d9->wined3d.
...
- Add prototypes for the COM interfaces.
- Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
41427857b1
Add render target support, and ensure there is a front and back buffer
...
created during device creation.
2005-01-09 17:37:02 +00:00
cf1d00bb08
Removed excessive statement (break after return or goto, not useful
...
break, not needed vars...)
2005-01-09 16:42:53 +00:00
c4de952eb5
Add Clear, Present and EndScene support and fix a bug in the drawing
...
code.
2004-12-14 11:54:27 +00:00
2003c7ab11
Add {G,S}etRenderState and {G,S}etTextureStageState support, and
...
ensure the stateblock is fully populated at device startup.
2004-12-13 13:35:38 +00:00
f738c146e2
Add {G,S}etIndices, {G,S}Viewport and enable the basic drawing
...
functionality into wined3d and call from d3d9.
2004-12-09 11:42:34 +00:00
819b0e1190
Add BaseTexture class support, call from d3d9.
2004-12-07 14:29:12 +00:00
294835a839
Another round of const correctness fixes.
2004-12-06 20:43:55 +00:00
0a258964c2
Const correctness fixes.
2004-11-30 21:38:57 +00:00
0a944ae319
Implement Material, Clip plane and Light support plus
...
MultiplyTransform.
2004-11-29 17:53:42 +00:00
eba27af4f1
Add Get/Set Transform support, plus BeginScene (does nothing).
2004-11-28 15:04:41 +00:00
73e8baffd2
Add indexbuffer support into wined3d.
2004-11-24 18:13:41 +00:00
5c38e1b561
Version resources cleanup.
2004-11-23 13:59:34 +00:00
289562eeb5
- Implement SetStreamSource
...
- Ensure wined3d objects maintain a reference count of at least that
of the d3dx version.
2004-11-23 13:52:46 +00:00
447d5ed048
Implement the beginnings of the stateblock class, and a first method
...
to use it.
2004-10-21 20:59:12 +00:00
db7a50582c
- Add support (as far as was previously) for the VertexBuffer and
...
Resource classes in wined3d and use when called from d3d9.
- Reduce the header includes in all the d3d9 interface to one common
set in the private header.
2004-10-14 00:32:04 +00:00
b9e2bedac1
Copy and tidy up the code from dx8 create device into wined3d. Call
...
from wined3d and d3d8, but short term only use the code for real from
d3d9.
2004-10-08 20:52:33 +00:00
ac490fabac
Add a IWineD3DDevice object type (empty for now), and create one when
...
an IDirect3DDevice object is created.
2004-10-07 04:22:21 +00:00
486d020c1b
Don't define COBJMACROS in objbase.h.
...
Update the Wine sources accordingly.
2004-10-07 03:06:48 +00:00
b519893e41
Move the GetDeviceCaps into the wined3d library and call from d3d9.
2004-10-06 00:05:29 +00:00
c579fa6213
Move the Check* type functions into wined3d and copy from d3d9, and
...
flag that they are mostly stubs.
2004-10-05 02:14:06 +00:00
c3421ea434
Move into wined3d and call from d3d9 the GetAdapterId function and
...
copy all the gl declarations into the more global wined3d_gl header
file.
2004-09-29 21:26:47 +00:00
ae5a436873
- Make d3d8 know about the wined3d device and start using it.
...
- Move some of the screen mode related functions into wined3d and add
untested support for the new d3d9 options of providing the format to
some of the calls.
- Move other functions from the directx interface into the common
library and implement the calls from d3d9 as well.
- Copy across the first of the functions used to make traces more readable,
creating utils.c to store them in. Eventually the ones in d3d8 will be
removed but for now just duplicate the code.
2004-09-28 02:12:12 +00:00
24ab49e250
Create a wined3d interface, and generate a wined3d object in the d3d9
...
create method. Make the first (simple) call implementation into the
new wined3d interface.
2004-09-23 04:34:27 +00:00
f5f7a1822c
Removed some more uses of the non-standard ICOM_THIS macro.
2004-09-08 01:50:37 +00:00
fe442b21f7
Fix signed/unsigned comparison warnings.
2004-09-08 01:23:57 +00:00
f714b39762
Get rid of the no longer used ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
...
macro.
2004-08-23 19:39:48 +00:00
48c4bb3c31
Get rid of the non-standard ICOM_VTABLE macro.
2004-08-12 23:00:51 +00:00
0467ce9fd7
Get rid of the non-standard ICOM_VFIELD macro.
2004-08-12 19:52:49 +00:00
cead7c0e81
Updated some MSDN links in the code.
2004-07-30 00:03:02 +00:00
10778aa761
Updated the version info of all DirectX dlls to the version numbers of
...
DirectX 9.0b for Windows 2000/XP.
2004-05-14 21:37:32 +00:00
9e4ed6460c
.spec.c files are no longer used for 32-bit dlls.
2004-03-24 03:36:44 +00:00
20b4585e3c
Only link against libdxguid where necessary.
2004-01-27 00:11:16 +00:00
fbdfd910c1
Remove SYMBOLFILE and LDDLLFLAGS from Makefiles.
2003-10-11 01:09:15 +00:00
803d9a8997
Set version to 9.
2003-09-29 20:12:38 +00:00
e37c6e18d0
Fixed header dependencies to be fully compatible with the Windows
...
headers (with help from Dimitrie O. Paun).
2003-09-05 23:08:26 +00:00
ba78aac406
Fixed some issues found by winapi_check.
2003-08-08 21:07:23 +00:00
a3dbd7e2c7
- some cleanups and fixes on d3d8 and d3d9 headers
...
- a lot of stubs for d3d9.dll
2003-07-01 01:09:17 +00:00
Peter Beutner