X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=d3d8types.py;h=6136d9888c15774525ce11d6650e2e5a63acc4d4;hb=447f4a55a01e82b0265f44212b8d439fa83750d7;hp=ad8b35b71ab75fca55ebdba5bbd90875612506dd;hpb=7ad4026e424c61d72c0099f4d1a504fe46d774bf;p=apitrace

diff --git a/d3d8types.py b/d3d8types.py
index ad8b35b..6136d98 100644
--- a/d3d8types.py
+++ b/d3d8types.py
@@ -25,7 +25,7 @@
 
 """d3d8types.h"""
 
-from windows import *
+from winapi import *
 
 D3DCOLOR = Alias("D3DCOLOR", DWORD)
 
@@ -104,7 +104,6 @@ D3DLIGHTTYPE = Enum("D3DLIGHTTYPE", [
     "D3DLIGHT_POINT",
     "D3DLIGHT_SPOT",
     "D3DLIGHT_DIRECTIONAL",
-    "D3DLIGHT_FORCE_DWORD",
 ])
 
 D3DLIGHT8 = Struct("D3DLIGHT8", [
@@ -123,7 +122,7 @@ D3DLIGHT8 = Struct("D3DLIGHT8", [
     (Float, "Phi"),
 ])
 
-D3DCS = Flags(DWORD, [
+D3DCLEAR = Flags(DWORD, [
     "D3DCLEAR_TARGET",
     "D3DCLEAR_ZBUFFER",
     "D3DCLEAR_STENCIL",
@@ -133,14 +132,12 @@ D3DSHADEMODE = Enum("D3DSHADEMODE", [
     "D3DSHADE_FLAT",
     "D3DSHADE_GOURAUD",
     "D3DSHADE_PHONG",
-    "D3DSHADE_FORCE_DWORD",
 ])
 
 D3DFILLMODE = Enum("D3DFILLMODE", [
     "D3DFILL_POINT",
     "D3DFILL_WIREFRAME",
     "D3DFILL_SOLID",
-    "D3DFILL_FORCE_DWORD",
 ])
 
 D3DLINEPATTERN = Struct("D3DLINEPATTERN", [
@@ -162,7 +159,6 @@ D3DBLEND = Enum("D3DBLEND", [
     "D3DBLEND_SRCALPHASAT",
     "D3DBLEND_BOTHSRCALPHA",
     "D3DBLEND_BOTHINVSRCALPHA",
-    "D3DBLEND_FORCE_DWORD",
 ])
 
 D3DBLENDOP = Enum("D3DBLENDOP", [
@@ -171,7 +167,6 @@ D3DBLENDOP = Enum("D3DBLENDOP", [
     "D3DBLENDOP_REVSUBTRACT",
     "D3DBLENDOP_MIN",
     "D3DBLENDOP_MAX",
-    "D3DBLENDOP_FORCE_DWORD",
 ])
 
 D3DTEXTUREADDRESS = Enum("D3DTEXTUREADDRESS", [
@@ -180,14 +175,12 @@ D3DTEXTUREADDRESS = Enum("D3DTEXTUREADDRESS", [
     "D3DTADDRESS_CLAMP",
     "D3DTADDRESS_BORDER",
     "D3DTADDRESS_MIRRORONCE",
-    "D3DTADDRESS_FORCE_DWORD",
 ])
 
 D3DCULL = Enum("D3DCULL", [
     "D3DCULL_NONE",
     "D3DCULL_CW",
     "D3DCULL_CCW",
-    "D3DCULL_FORCE_DWORD",
 ])
 
 D3DCMPFUNC = Enum("D3DCMPFUNC", [
@@ -199,7 +192,6 @@ D3DCMPFUNC = Enum("D3DCMPFUNC", [
     "D3DCMP_NOTEQUAL",
     "D3DCMP_GREATEREQUAL",
     "D3DCMP_ALWAYS",
-    "D3DCMP_FORCE_DWORD",
 ])
 
 D3DSTENCILOP = Enum("D3DSTENCILOP", [
@@ -211,7 +203,6 @@ D3DSTENCILOP = Enum("D3DSTENCILOP", [
     "D3DSTENCILOP_INVERT",
     "D3DSTENCILOP_INCR",
     "D3DSTENCILOP_DECR",
-    "D3DSTENCILOP_FORCE_DWORD",
 ])
 
 D3DFOGMODE = Enum("D3DFOGMODE", [
@@ -219,14 +210,12 @@ D3DFOGMODE = Enum("D3DFOGMODE", [
     "D3DFOG_EXP",
     "D3DFOG_EXP2",
     "D3DFOG_LINEAR",
-    "D3DFOG_FORCE_DWORD",
 ])
 
 D3DZBUFFERTYPE = Enum("D3DZBUFFERTYPE", [
     "D3DZB_FALSE",
     "D3DZB_TRUE",
     "D3DZB_USEW",
-    "D3DZB_FORCE_DWORD",
 ])
 
 D3DPRIMITIVETYPE = Enum("D3DPRIMITIVETYPE", [
@@ -236,7 +225,6 @@ D3DPRIMITIVETYPE = Enum("D3DPRIMITIVETYPE", [
     "D3DPT_TRIANGLELIST",
     "D3DPT_TRIANGLESTRIP",
     "D3DPT_TRIANGLEFAN",
-    "D3DPT_FORCE_DWORD",
 ])
 
 D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", [
@@ -250,7 +238,6 @@ D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", [
     "D3DTS_TEXTURE5",
     "D3DTS_TEXTURE6",
     "D3DTS_TEXTURE7",
-    "D3DTS_FORCE_DWORD",
 ])
 
 D3DTS = Flags(DWORD, [
@@ -337,14 +324,12 @@ D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [
     "D3DRS_BLENDOP",
     "D3DRS_POSITIONORDER",
     "D3DRS_NORMALORDER",
-    "D3DRS_FORCE_DWORD",
 ])
 
 D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [
     "D3DMCS_MATERIAL",
     "D3DMCS_COLOR1",
     "D3DMCS_COLOR2",
-    "D3DMCS_FORCE_DWORD",
 ])
 
 D3DWRAP = Flags(DWORD, [
@@ -395,7 +380,6 @@ D3DTEXTURESTAGESTATETYPE = Enum("D3DTEXTURESTAGESTATETYPE", [
     "D3DTSS_COLORARG0",
     "D3DTSS_ALPHAARG0",
     "D3DTSS_RESULTARG",
-    "D3DTSS_FORCE_DWORD",
 ])
 
 D3DTSS = Flags(DWORD, [
@@ -432,7 +416,6 @@ D3DTEXTUREOP = Enum("D3DTEXTUREOP", [
     "D3DTOP_DOTPRODUCT3",
     "D3DTOP_MULTIPLYADD",
     "D3DTOP_LERP",
-    "D3DTOP_FORCE_DWORD",
 ])
 
 D3DTA = Flags(DWORD, [
@@ -454,7 +437,6 @@ D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", [
     "D3DTEXF_ANISOTROPIC",
     "D3DTEXF_FLATCUBIC",
     "D3DTEXF_GAUSSIANCUBIC",
-    "D3DTEXF_FORCE_DWORD",
 ])
 
 D3DPV = Flags(DWORD, [
@@ -514,7 +496,6 @@ D3DVSD_TOKENTYPE = Enum("D3DVSD_TOKENTYPE", [
     "D3DVSD_TOKEN_CONSTMEM",
     "D3DVSD_TOKEN_EXT",
     "D3DVSD_TOKEN_END",
-    "D3DVSD_FORCE_DWORD",
 ])
 
 D3DVSDT = Flags(DWORD, [
@@ -602,7 +583,6 @@ D3DSHADER_INSTRUCTION_OPCODE_TYPE = Enum("D3DSHADER_INSTRUCTION_OPCODE_TYPE", [
     "D3DSIO_PHASE",
     "D3DSIO_COMMENT",
     "D3DSIO_END",
-    "D3DSIO_FORCE_DWORD",
 ])
 
 D3DSP = Flags(DWORD, [
@@ -616,7 +596,6 @@ D3DSP = Flags(DWORD, [
 D3DSHADER_PARAM_DSTMOD_TYPE = Enum("D3DSHADER_PARAM_DSTMOD_TYPE", [
     "D3DSPDM_NONE",
     "D3DSPDM_SATURATE",
-    "D3DSPDM_FORCE_DWORD",
 ])
 
 D3DSHADER_PARAM_REGISTER_TYPE = Enum("D3DSHADER_PARAM_REGISTER_TYPE", [
@@ -627,20 +606,17 @@ D3DSHADER_PARAM_REGISTER_TYPE = Enum("D3DSHADER_PARAM_REGISTER_TYPE", [
     "D3DSPR_RASTOUT",
     "D3DSPR_ATTROUT",
     "D3DSPR_TEXCRDOUT",
-    "D3DSPR_FORCE_DWORD",
 ])
 
 D3DVS_RASTOUT_OFFSETS = Enum("D3DVS_RASTOUT_OFFSETS", [
     "D3DSRO_POSITION",
     "D3DSRO_FOG",
     "D3DSRO_POINT_SIZE",
-    "D3DSRO_FORCE_DWORD",
 ])
 
 D3DVS_ADDRESSMODE_TYPE = Enum("D3DVS_ADDRESSMODE_TYPE", [
     "D3DVS_ADDRMODE_ABSOLUTE",
     "D3DVS_ADDRMODE_RELATIVE",
-    "D3DVS_ADDRMODE_FORCE_DWORD",
 ])
 
 D3DVS = Flags(DWORD, [
@@ -683,14 +659,12 @@ D3DSHADER_PARAM_SRCMOD_TYPE = Enum("D3DSHADER_PARAM_SRCMOD_TYPE", [
     "D3DSPSM_X2NEG",
     "D3DSPSM_DZ",
     "D3DSPSM_DW",
-    "D3DSPSM_FORCE_DWORD",
 ])
 
 D3DBASISTYPE = Enum("D3DBASISTYPE", [
     "D3DBASIS_BEZIER",
     "D3DBASIS_BSPLINE",
     "D3DBASIS_INTERPOLATE",
-    "D3DBASIS_FORCE_DWORD",
 ])
 
 D3DORDERTYPE = Enum("D3DORDERTYPE", [
@@ -698,20 +672,17 @@ D3DORDERTYPE = Enum("D3DORDERTYPE", [
     "D3DORDER_QUADRATIC",
     "D3DORDER_CUBIC",
     "D3DORDER_QUINTIC",
-    "D3DORDER_FORCE_DWORD",
 ])
 
 D3DPATCHEDGESTYLE = Enum("D3DPATCHEDGESTYLE", [
     "D3DPATCHEDGE_DISCRETE",
     "D3DPATCHEDGE_CONTINUOUS",
-    "D3DPATCHEDGE_FORCE_DWORD",
 ])
 
 D3DSTATEBLOCKTYPE = Enum("D3DSTATEBLOCKTYPE", [
     "D3DSBT_ALL",
     "D3DSBT_PIXELSTATE",
     "D3DSBT_VERTEXSTATE",
-    "D3DSBT_FORCE_DWORD",
 ])
 
 D3DVERTEXBLENDFLAGS = Enum("D3DVERTEXBLENDFLAGS", [
@@ -721,7 +692,6 @@ D3DVERTEXBLENDFLAGS = Enum("D3DVERTEXBLENDFLAGS", [
     "D3DVBF_3WEIGHTS",
     "D3DVBF_TWEENING",
     "D3DVBF_0WEIGHTS",
-    "D3DVBF_FORCE_DWORD",
 ])
 
 D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", [
@@ -731,14 +701,12 @@ D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", [
     "D3DTTFF_COUNT3",
     "D3DTTFF_COUNT4",
     "D3DTTFF_PROJECTED",
-    "D3DTTFF_FORCE_DWORD",
 ])
 
 D3DDEVTYPE = Enum("D3DDEVTYPE", [
     "D3DDEVTYPE_HAL",
     "D3DDEVTYPE_REF",
     "D3DDEVTYPE_SW",
-    "D3DDEVTYPE_FORCE_DWORD",
 ])
 
 D3DMULTISAMPLE_TYPE = Enum("D3DMULTISAMPLE_TYPE", [
@@ -758,7 +726,6 @@ D3DMULTISAMPLE_TYPE = Enum("D3DMULTISAMPLE_TYPE", [
     "D3DMULTISAMPLE_14_SAMPLES",
     "D3DMULTISAMPLE_15_SAMPLES",
     "D3DMULTISAMPLE_16_SAMPLES",
-    "D3DMULTISAMPLE_FORCE_DWORD",
 ])
 
 D3DFORMAT = Enum("D3DFORMAT", [
@@ -805,7 +772,6 @@ D3DFORMAT = Enum("D3DFORMAT", [
     "D3DFMT_VERTEXDATA",
     "D3DFMT_INDEX16",
     "D3DFMT_INDEX32",
-    "D3DFMT_FORCE_DWORD",
 ])
 
 D3DDISPLAYMODE = Struct("D3DDISPLAYMODE", [
@@ -827,7 +793,6 @@ D3DSWAPEFFECT = Enum("D3DSWAPEFFECT", [
     "D3DSWAPEFFECT_FLIP",
     "D3DSWAPEFFECT_COPY",
     "D3DSWAPEFFECT_COPY_VSYNC",
-    "D3DSWAPEFFECT_FORCE_DWORD",
 ])
 
 D3DPOOL = Enum("D3DPOOL", [
@@ -835,7 +800,6 @@ D3DPOOL = Enum("D3DPOOL", [
     "D3DPOOL_MANAGED",
     "D3DPOOL_SYSTEMMEM",
     "D3DPOOL_SCRATCH",
-    "D3DPOOL_FORCE_DWORD",
 ])
 
 D3DPRESENT = Flags(DWORD, [
@@ -864,16 +828,15 @@ D3DPRESENTFLAG = Flags(DWORD, [
 ])
 
 D3DGAMMARAMP = Struct("D3DGAMMARAMP", [
-    (WORD, "red[256]"),
-    (WORD, "green[256]"),
-    (WORD, "blue[256]"),
+    (Array(WORD, "256"), "red"),
+    (Array(WORD, "256"), "green"),
+    (Array(WORD, "256"), "blue"),
 ])
 
 D3DBACKBUFFER_TYPE = Enum("D3DBACKBUFFER_TYPE", [
     "D3DBACKBUFFER_TYPE_MONO",
     "D3DBACKBUFFER_TYPE_LEFT",
     "D3DBACKBUFFER_TYPE_RIGHT",
-    "D3DBACKBUFFER_TYPE_FORCE_DWORD",
 ])
 
 D3DRESOURCETYPE = Enum("D3DRESOURCETYPE", [
@@ -884,7 +847,6 @@ D3DRESOURCETYPE = Enum("D3DRESOURCETYPE", [
     "D3DRTYPE_CUBETEXTURE",
     "D3DRTYPE_VERTEXBUFFER",
     "D3DRTYPE_INDEXBUFFER",
-    "D3DRTYPE_FORCE_DWORD",
 ])
 
 D3DUSAGE = Flags(DWORD, [
@@ -906,7 +868,6 @@ D3DCUBEMAP_FACES = Enum("D3DCUBEMAP_FACES", [
     "D3DCUBEMAP_FACE_NEGATIVE_Y",
     "D3DCUBEMAP_FACE_POSITIVE_Z",
     "D3DCUBEMAP_FACE_NEGATIVE_Z",
-    "D3DCUBEMAP_FACE_FORCE_DWORD",
 ])
 
 D3DLOCK = Flags(DWORD, [
@@ -999,8 +960,8 @@ D3DTRIPATCH_INFO = Struct("D3DTRIPATCH_INFO", [
 ])
 
 D3DADAPTER_IDENTIFIER8 = Struct("D3DADAPTER_IDENTIFIER8", [
-    (String, "Driver"),
-    (String, "Description"),
+    (CString, "Driver"),
+    (CString, "Description"),
     (LARGE_INTEGER, "DriverVersion"),
     (DWORD, "VendorId"),
     (DWORD, "DeviceId"),
@@ -1018,7 +979,6 @@ D3DRASTER_STATUS = Struct("D3DRASTER_STATUS", [
 D3DDEBUGMONITORTOKENS = Enum("D3DDEBUGMONITORTOKENS", [
     "D3DDMT_ENABLE",
     "D3DDMT_DISABLE",
-    "D3DDMT_FORCE_DWORD",
 ])
 
 D3DDEVINFOID = Flags(DWORD, [
@@ -1041,7 +1001,7 @@ D3DRESOURCESTATS = Struct("D3DRESOURCESTATS", [
 ])
 
 D3DDEVINFO_RESOURCEMANAGER = Struct("D3DDEVINFO_RESOURCEMANAGER", [
-    (D3DRESOURCESTATS, "stats[D3DRTYPECOUNT]"),
+    (Array(D3DRESOURCESTATS, "D3DRTYPECOUNT"), "stats"),
 ])
 
 D3DDEVINFO_D3DVERTEXSTATS = Struct("D3DDEVINFO_D3DVERTEXSTATS", [