include/wine: Remove cpp_quote hackery for_WINED3DTRANSFORMSTATETYPE (was: Remove cpp_quote hackery from wined3d.idl)

[Gerald Pfeifer]

On Mon, 28 Dec 2009, Henri Verbeet wrote:
>> And in dlls/wined3d/utils.c we have TSTYPE_TO_STR(WINED3DTS_WORLDMATRIX(0))
>> in debug_d3dtstype which also triggers the warning.
> You can do something similar with WINED3DTRANSFORMSTATETYPE, and then
> replace WINED3DTS_WORLDMATRIX(0) with WINED3DTS_WORLD.

In terms of warnings the patch below seems sufficient, but I can (will)
submit the trivial patch for dlls/wined3d/utils.c, too.

Thanks again for your guidance, Henri.

Gerald

ChangeLog:
Move WINED3DTS_WORLD et al directly into _WINED3DTRANSFORMSTATETYPE.

diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index c4fc4ca..487d16d 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -716,12 +716,12 @@ typedef enum _WINED3DTRANSFORMSTATETYPE
     WINED3DTS_TEXTURE5                      = 21,
     WINED3DTS_TEXTURE6                      = 22,
     WINED3DTS_TEXTURE7                      = 23,
+    WINED3DTS_WORLD                         = 256, /*WINED3DTS_WORLDMATRIX(0)*/
+    WINED3DTS_WORLD1                        = 257,
+    WINED3DTS_WORLD2                        = 258,
+    WINED3DTS_WORLD3                        = 259,
     WINED3DTS_FORCE_DWORD                   = 0x7fffffff
 } WINED3DTRANSFORMSTATETYPE;
-cpp_quote("#define WINED3DTS_WORLD  WINED3DTS_WORLDMATRIX(0)")
-cpp_quote("#define WINED3DTS_WORLD1 WINED3DTS_WORLDMATRIX(1)")
-cpp_quote("#define WINED3DTS_WORLD2 WINED3DTS_WORLDMATRIX(2)")
-cpp_quote("#define WINED3DTS_WORLD3 WINED3DTS_WORLDMATRIX(3)")
 cpp_quote("#define WINED3DTS_WORLDMATRIX(index) (WINED3DTRANSFORMSTATETYPE)(index + 256)")
 
 typedef enum _WINED3DBASISTYPE