Dump flags.

diff --git a/base.py b/base.py
index 40f98998ebc95b44a597a0378da6df52a737cbdf..60920560c6c0c2d85e6aa0cb512eae64e3508727 100644 (file)
--- a/base.py
+++ b/base.py
@@ -125,8 +125,20 @@ class Flags(Type):
 
     def __init__(self, type, values):
         Type.__init__(self, type.name)
+        self.type = type
         self.values = values
 
+    def dump(self, instance):
+        print '    {'
+        print '        %s l_Value = %s;' % (self.type, instance)
+        for value in self.values:
+            print '        if((l_Value & %s) == %s) {' % (value, value)
+            print '            g_pLog->Text("%s | ");' % value
+            print '            l_Value &= ~%s;' % value
+            print '        }'
+        self.type.dump("l_Value");
+        print '    }'
+
 
 class Struct(Type):
 
@@ -296,6 +308,7 @@ class WrapPointer(Pointer):
         print "        %s = static_cast<%s *>(%s)->m_pInstance;" % (instance, self.type.wrap_name(), instance)
 
 String = Intrinsic("char *", "%s")
+Short = Intrinsic("short", "%i")
 Int = Intrinsic("int", "%i")
 Long = Intrinsic("long", "%li")
 Float = Intrinsic("float", "%f")

diff --git a/d3d8caps.py b/d3d8caps.py
index 6e0435e9d0130c81c2472ba18a2b2c705078af5a..6acde2740a62a9131b4136181b83d4d1c2324d5c 100644 (file)
--- a/d3d8caps.py
+++ b/d3d8caps.py
@@ -22,11 +22,11 @@
 from windows import *
 from d3d8types import *
 
-D3DCAPS = Flags(DWORD, (
+D3DCAPS = Flags(DWORD, [
     "D3DCAPS_READ_SCANLINE",
-))
+])
 
-D3DCAPS2 = Flags(DWORD, (
+D3DCAPS2 = Flags(DWORD, [
     "D3DCAPS2_NO2DDURING3DSCENE",
     "D3DCAPS2_FULLSCREENGAMMA",
     "D3DCAPS2_CANRENDERWINDOWED",
@@ -34,29 +34,28 @@ D3DCAPS2 = Flags(DWORD, (
     "D3DCAPS2_RESERVED",
     "D3DCAPS2_CANMANAGERESOURCE",
     "D3DCAPS2_DYNAMICTEXTURES",
-))
+])
 
-D3DCAPS3 = Flags(DWORD, (
+D3DCAPS3 = Flags(DWORD, [
     "D3DCAPS3_RESERVED",
-
     "D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD",
-))
+])
 
-D3DPRESENT_INTERVAL = Flags(DWORD, (
+D3DPRESENT_INTERVAL = Flags(DWORD, [
     "D3DPRESENT_INTERVAL_DEFAULT",
     "D3DPRESENT_INTERVAL_ONE",
     "D3DPRESENT_INTERVAL_TWO",
     "D3DPRESENT_INTERVAL_THREE",
     "D3DPRESENT_INTERVAL_FOUR",
     "D3DPRESENT_INTERVAL_IMMEDIATE",
-))
+])
 
-D3DCURSORCAPS = Flags(DWORD, (
+D3DCURSORCAPS = Flags(DWORD, [
     "D3DCURSORCAPS_COLOR",
     "D3DCURSORCAPS_LOWRES",
-))
+])
 
-D3DDEVCAPS = Flags(DWORD, (
+D3DDEVCAPS = Flags(DWORD, [
     "D3DDEVCAPS_EXECUTESYSTEMMEMORY",
     "D3DDEVCAPS_EXECUTEVIDEOMEMORY",
     "D3DDEVCAPS_TLVERTEXSYSTEMMEMORY",
@@ -77,9 +76,9 @@ D3DDEVCAPS = Flags(DWORD, (
     "D3DDEVCAPS_RTPATCHES",
     "D3DDEVCAPS_RTPATCHHANDLEZERO",
     "D3DDEVCAPS_NPATCHES",
-))
+])
 
-D3DPMISCCAPS = Flags(DWORD, (
+D3DPMISCCAPS = Flags(DWORD, [
     "D3DPMISCCAPS_MASKZ",
     "D3DPMISCCAPS_LINEPATTERNREP",
     "D3DPMISCCAPS_CULLNONE",
@@ -91,17 +90,17 @@ D3DPMISCCAPS = Flags(DWORD, (
     "D3DPMISCCAPS_TSSARGTEMP",
     "D3DPMISCCAPS_BLENDOP",
     "D3DPMISCCAPS_NULLREFERENCE",
-))
+])
 
-D3DLINECAPS = Flags(DWORD, (
+D3DLINECAPS = Flags(DWORD, [
     "D3DLINECAPS_TEXTURE",
     "D3DLINECAPS_ZTEST",
     "D3DLINECAPS_BLEND",
     "D3DLINECAPS_ALPHACMP",
     "D3DLINECAPS_FOG",
-))
+])
 
-D3DPRASTERCAPS = Flags(DWORD, (
+D3DPRASTERCAPS = Flags(DWORD, [
     "D3DPRASTERCAPS_DITHER",
     "D3DPRASTERCAPS_PAT",
     "D3DPRASTERCAPS_ZTEST",
@@ -118,9 +117,9 @@ D3DPRASTERCAPS = Flags(DWORD, (
     "D3DPRASTERCAPS_ZFOG",
     "D3DPRASTERCAPS_COLORPERSPECTIVE",
     "D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE",
-))
+])
 
-D3DPCMPCAPS = Flags(DWORD, (
+D3DPCMPCAPS = Flags(DWORD, [
     "D3DPCMPCAPS_NEVER",
     "D3DPCMPCAPS_LESS",
     "D3DPCMPCAPS_EQUAL",
@@ -129,9 +128,9 @@ D3DPCMPCAPS = Flags(DWORD, (
     "D3DPCMPCAPS_NOTEQUAL",
     "D3DPCMPCAPS_GREATEREQUAL",
     "D3DPCMPCAPS_ALWAYS",
-))
+])
 
-D3DPBLENDCAPS = Flags(DWORD, (
+D3DPBLENDCAPS = Flags(DWORD, [
     "D3DPBLENDCAPS_ZERO",
     "D3DPBLENDCAPS_ONE",
     "D3DPBLENDCAPS_SRCCOLOR",
@@ -145,14 +144,16 @@ D3DPBLENDCAPS = Flags(DWORD, (
     "D3DPBLENDCAPS_SRCALPHASAT",
     "D3DPBLENDCAPS_BOTHSRCALPHA",
     "D3DPBLENDCAPS_BOTHINVSRCALPHA",
+])
 
+D3DPSHADECAPS = Flags(DWORD, [
     "D3DPSHADECAPS_COLORGOURAUDRGB",
     "D3DPSHADECAPS_SPECULARGOURAUDRGB",
     "D3DPSHADECAPS_ALPHAGOURAUDBLEND",
     "D3DPSHADECAPS_FOGGOURAUD",
-))
+])
 
-D3DPTEXTURECAPS = Flags(DWORD, (
+D3DPTEXTURECAPS = Flags(DWORD, [
     "D3DPTEXTURECAPS_PERSPECTIVE",
     "D3DPTEXTURECAPS_POW2",
     "D3DPTEXTURECAPS_ALPHA",
@@ -168,9 +169,9 @@ D3DPTEXTURECAPS = Flags(DWORD, (
     "D3DPTEXTURECAPS_MIPCUBEMAP",
     "D3DPTEXTURECAPS_CUBEMAP_POW2",
     "D3DPTEXTURECAPS_VOLUMEMAP_POW2",
-))
+])
 
-D3DPTFILTERCAPS = Flags(DWORD, (
+D3DPTFILTERCAPS = Flags(DWORD, [
     "D3DPTFILTERCAPS_MINFPOINT",
     "D3DPTFILTERCAPS_MINFLINEAR",
     "D3DPTFILTERCAPS_MINFANISOTROPIC",
@@ -181,18 +182,18 @@ D3DPTFILTERCAPS = Flags(DWORD, (
     "D3DPTFILTERCAPS_MAGFANISOTROPIC",
     "D3DPTFILTERCAPS_MAGFAFLATCUBIC",
     "D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC",
-))
+])
 
-D3DPTADDRESSCAPS = Flags(DWORD, (
+D3DPTADDRESSCAPS = Flags(DWORD, [
     "D3DPTADDRESSCAPS_WRAP",
     "D3DPTADDRESSCAPS_MIRROR",
     "D3DPTADDRESSCAPS_CLAMP",
     "D3DPTADDRESSCAPS_BORDER",
     "D3DPTADDRESSCAPS_INDEPENDENTUV",
     "D3DPTADDRESSCAPS_MIRRORONCE",
-))
+])
 
-D3DSTENCILCAPS = Flags(DWORD, (
+D3DSTENCILCAPS = Flags(DWORD, [
     "D3DSTENCILCAPS_KEEP",
     "D3DSTENCILCAPS_ZERO",
     "D3DSTENCILCAPS_REPLACE",
@@ -201,9 +202,9 @@ D3DSTENCILCAPS = Flags(DWORD, (
     "D3DSTENCILCAPS_INVERT",
     "D3DSTENCILCAPS_INCR",
     "D3DSTENCILCAPS_DECR",
-))
+])
 
-D3DTEXOPCAPS = Flags(DWORD, (
+D3DTEXOPCAPS = Flags(DWORD, [
     "D3DTEXOPCAPS_DISABLE",
     "D3DTEXOPCAPS_SELECTARG1",
     "D3DTEXOPCAPS_SELECTARG2",
@@ -230,15 +231,15 @@ D3DTEXOPCAPS = Flags(DWORD, (
     "D3DTEXOPCAPS_DOTPRODUCT3",
     "D3DTEXOPCAPS_MULTIPLYADD",
     "D3DTEXOPCAPS_LERP",
-))
+])
 
-D3DFVFCAPS = Flags(DWORD, (
+D3DFVFCAPS = Flags(DWORD, [
     "D3DFVFCAPS_TEXCOORDCOUNTMASK",
     "D3DFVFCAPS_DONOTSTRIPELEMENTS",
     "D3DFVFCAPS_PSIZE",
-))
+])
 
-D3DVTXPCAPS = Flags(DWORD, (
+D3DVTXPCAPS = Flags(DWORD, [
     "D3DVTXPCAPS_TEXGEN",
     "D3DVTXPCAPS_MATERIALSOURCE7",
     "D3DVTXPCAPS_DIRECTIONALLIGHTS",
@@ -246,31 +247,50 @@ D3DVTXPCAPS = Flags(DWORD, (
     "D3DVTXPCAPS_LOCALVIEWER",
     "D3DVTXPCAPS_TWEENING",
     "D3DVTXPCAPS_NO_VSDT_UBYTE4",
-))
+])
+
+D3DPS_VERSION = Enum("DWORD", [
+    "D3DPS_VERSION(0,0)",
+    "D3DPS_VERSION(1,0)",
+    "D3DPS_VERSION(1,1)",
+    "D3DPS_VERSION(1,2)",
+    "D3DPS_VERSION(1,3)",
+    "D3DPS_VERSION(1,4)",
+    "D3DPS_VERSION(2,0)",
+    "D3DPS_VERSION(3,0)",
+])
+
+D3DVS_VERSION = Enum("DWORD", [
+    "D3DVS_VERSION(0,0)",
+    "D3DVS_VERSION(1,0)",
+    "D3DVS_VERSION(1,1)",
+    "D3DVS_VERSION(2,0)",
+    "D3DVS_VERSION(3,0)",
+])
 
-D3DCAPS8 = Struct("D3DCAPS8", (
+D3DCAPS8 = Struct("D3DCAPS8", [
     (D3DDEVTYPE, "DeviceType"),
     (UINT, "AdapterOrdinal"),
-    (DWORD, "Caps"),
-    (DWORD, "Caps2"),
-    (DWORD, "Caps3"),
-    (DWORD, "PresentationIntervals"),
-    (DWORD, "CursorCaps"),
-    (DWORD, "DevCaps"),
-    (DWORD, "PrimitiveMiscCaps"),
-    (DWORD, "RasterCaps"),
-    (DWORD, "ZCmpCaps"),
-    (DWORD, "SrcBlendCaps"),
-    (DWORD, "DestBlendCaps"),
-    (DWORD, "AlphaCmpCaps"),
-    (DWORD, "ShadeCaps"),
-    (DWORD, "TextureCaps"),
-    (DWORD, "TextureFilterCaps"),
-    (DWORD, "CubeTextureFilterCaps"),
-    (DWORD, "VolumeTextureFilterCaps"),
-    (DWORD, "TextureAddressCaps"),
-    (DWORD, "VolumeTextureAddressCaps"),
-    (DWORD, "LineCaps"),
+    (D3DCAPS, "Caps"),
+    (D3DCAPS2, "Caps2"),
+    (D3DCAPS3, "Caps3"),
+    (D3DPRESENT_INTERVAL, "PresentationIntervals"),
+    (D3DCURSORCAPS, "CursorCaps"),
+    (D3DDEVCAPS, "DevCaps"),
+    (D3DPMISCCAPS, "PrimitiveMiscCaps"),
+    (D3DPRASTERCAPS, "RasterCaps"),
+    (D3DPCMPCAPS, "ZCmpCaps"),
+    (D3DPBLENDCAPS, "SrcBlendCaps"),
+    (D3DPBLENDCAPS, "DestBlendCaps"),
+    (D3DPCMPCAPS, "AlphaCmpCaps"),
+    (D3DPSHADECAPS, "ShadeCaps"),
+    (D3DPTEXTURECAPS, "TextureCaps"),
+    (D3DPTFILTERCAPS, "TextureFilterCaps"),
+    (D3DPTFILTERCAPS, "CubeTextureFilterCaps"),
+    (D3DPTFILTERCAPS, "VolumeTextureFilterCaps"),
+    (D3DPTADDRESSCAPS, "TextureAddressCaps"),
+    (D3DPTADDRESSCAPS, "VolumeTextureAddressCaps"),
+    (D3DLINECAPS, "LineCaps"),
     (DWORD, "MaxTextureWidth"),
     (DWORD, "MaxTextureHeight"),
     (DWORD, "MaxVolumeExtent"),
@@ -283,12 +303,12 @@ D3DCAPS8 = Struct("D3DCAPS8", (
     (Float, "GuardBandRight"),
     (Float, "GuardBandBottom"),
     (Float, "ExtentsAdjust"),
-    (DWORD, "StencilCaps"),
-    (DWORD, "FVFCaps"),
-    (DWORD, "TextureOpCaps"),
+    (D3DSTENCILCAPS, "StencilCaps"),
+    (D3DFVFCAPS, "FVFCaps"),
+    (D3DTEXOPCAPS, "TextureOpCaps"),
     (DWORD, "MaxTextureBlendStages"),
     (DWORD, "MaxSimultaneousTextures"),
-    (DWORD, "VertexProcessingCaps"),
+    (D3DVTXPCAPS, "VertexProcessingCaps"),
     (DWORD, "MaxActiveLights"),
     (DWORD, "MaxUserClipPlanes"),
     (DWORD, "MaxVertexBlendMatrices"),
@@ -298,9 +318,9 @@ D3DCAPS8 = Struct("D3DCAPS8", (
     (DWORD, "MaxVertexIndex"),
     (DWORD, "MaxStreams"),
     (DWORD, "MaxStreamStride"),
-    (DWORD, "VertexShaderVersion"),
+    (D3DVS_VERSION, "VertexShaderVersion"),
     (DWORD, "MaxVertexShaderConst"),
-    (DWORD, "PixelShaderVersion"),
+    (D3DPS_VERSION, "PixelShaderVersion"),
     (Float, "MaxPixelShaderValue"),
-))
+])
 

diff --git a/d3d8types.py b/d3d8types.py
index 1a1c173906c31cabec7116703edbed85d35412af..6691b0f8265a69c2d12b3df2d20571850b09fc88 100644 (file)
--- a/d3d8types.py
+++ b/d3d8types.py
@@ -23,49 +23,49 @@ from windows import *
 
 D3DCOLOR = Alias("D3DCOLOR", DWORD)
 
-D3DVECTOR = Struct("D3DVECTOR", (
+D3DVECTOR = Struct("D3DVECTOR", [
     (Float, "x"),
     (Float, "y"),
     (Float, "z"),
-))
+])
 
-D3DCOLORVALUE = Struct("D3DCOLORVALUE", (
+D3DCOLORVALUE = Struct("D3DCOLORVALUE", [
     (Float, "r"),
     (Float, "g"),
     (Float, "b"),
     (Float, "a"),
-))
+])
 
-D3DRECT = Struct("D3DRECT", (
+D3DRECT = Struct("D3DRECT", [
     (LONG, "x1"),
     (LONG, "y1"),
     (LONG, "x2"),
     (LONG, "y2"),
-))
+])
 
-D3DMATRIX = Struct("D3DMATRIX", (
+D3DMATRIX = Struct("D3DMATRIX", [
     (Float, "m[4][4]"),
-))
+])
 
-D3DVIEWPORT8 = Struct("D3DVIEWPORT8", (
+D3DVIEWPORT8 = Struct("D3DVIEWPORT8", [
     (DWORD, "X"),
     (DWORD, "Y"),
     (DWORD, "Width"),
     (DWORD, "Height"),
     (Float, "MinZ"),
     (Float, "MaxZ"),
-))
+])
 
-D3DCLIP = Flags(DWORD, (
+D3DCLIP = Flags(DWORD, [
     "D3DCLIPPLANE0",
     "D3DCLIPPLANE1",
     "D3DCLIPPLANE2",
     "D3DCLIPPLANE3",
     "D3DCLIPPLANE4",
     "D3DCLIPPLANE5",
-))
+])
 
-D3DCS = Flags(DWORD, (
+D3DCS = Flags(DWORD, [
     "D3DCS_ALL",
     "D3DCS_LEFT",
     "D3DCS_RIGHT",
@@ -79,29 +79,29 @@ D3DCS = Flags(DWORD, (
     "D3DCS_PLANE3",
     "D3DCS_PLANE4",
     "D3DCS_PLANE5",
-))
+])
 
-D3DCLIPSTATUS8 = Struct("D3DCLIPSTATUS8", (
+D3DCLIPSTATUS8 = Struct("D3DCLIPSTATUS8", [
     (DWORD, "ClipUnion"),
     (DWORD, "ClipIntersection"),
-))
+])
 
-D3DMATERIAL8 = Struct("D3DMATERIAL8", (
+D3DMATERIAL8 = Struct("D3DMATERIAL8", [
     (D3DCOLORVALUE, "Diffuse"),
     (D3DCOLORVALUE, "Ambient"),
     (D3DCOLORVALUE, "Specular"),
     (D3DCOLORVALUE, "Emissive"),
     (Float, "Power"),
-))
+])
 
-D3DLIGHTTYPE = Enum("D3DLIGHTTYPE", (
+D3DLIGHTTYPE = Enum("D3DLIGHTTYPE", [
     "D3DLIGHT_POINT",
     "D3DLIGHT_SPOT",
     "D3DLIGHT_DIRECTIONAL",
     "D3DLIGHT_FORCE_DWORD",
-))
+])
 
-D3DLIGHT8 = Struct("D3DLIGHT8", (
+D3DLIGHT8 = Struct("D3DLIGHT8", [
     (D3DLIGHTTYPE, "Type"),
     (D3DCOLORVALUE, "Diffuse"),
     (D3DCOLORVALUE, "Specular"),
@@ -115,34 +115,34 @@ D3DLIGHT8 = Struct("D3DLIGHT8", (
     (Float, "Attenuation2"),
     (Float, "Theta"),
     (Float, "Phi"),
-))
+])
 
-D3DCS = Flags(DWORD, (
+D3DCS = Flags(DWORD, [
     "D3DCLEAR_TARGET",
     "D3DCLEAR_ZBUFFER",
     "D3DCLEAR_STENCIL",
-))
+])
 
-D3DSHADEMODE = Enum("D3DSHADEMODE", (
+D3DSHADEMODE = Enum("D3DSHADEMODE", [
     "D3DSHADE_FLAT",
     "D3DSHADE_GOURAUD",
     "D3DSHADE_PHONG",
     "D3DSHADE_FORCE_DWORD",
-))
+])
 
-D3DFILLMODE = Enum("D3DFILLMODE", (
+D3DFILLMODE = Enum("D3DFILLMODE", [
     "D3DFILL_POINT",
     "D3DFILL_WIREFRAME",
     "D3DFILL_SOLID",
     "D3DFILL_FORCE_DWORD",
-))
+])
 
-D3DLINEPATTERN = Struct("D3DLINEPATTERN", (
+D3DLINEPATTERN = Struct("D3DLINEPATTERN", [
     (WORD, "wRepeatFactor"),
     (WORD, "wLinePattern"),
-))
+])
 
-D3DBLEND = Enum("D3DBLEND", (
+D3DBLEND = Enum("D3DBLEND", [
     "D3DBLEND_ZERO",
     "D3DBLEND_ONE",
     "D3DBLEND_SRCCOLOR",
@@ -157,34 +157,34 @@ D3DBLEND = Enum("D3DBLEND", (
     "D3DBLEND_BOTHSRCALPHA",
     "D3DBLEND_BOTHINVSRCALPHA",
     "D3DBLEND_FORCE_DWORD",
-))
+])
 
-D3DBLENDOP = Enum("D3DBLENDOP", (
+D3DBLENDOP = Enum("D3DBLENDOP", [
     "D3DBLENDOP_ADD",
     "D3DBLENDOP_SUBTRACT",
     "D3DBLENDOP_REVSUBTRACT",
     "D3DBLENDOP_MIN",
     "D3DBLENDOP_MAX",
     "D3DBLENDOP_FORCE_DWORD",
-))
+])
 
-D3DTEXTUREADDRESS = Enum("D3DTEXTUREADDRESS", (
+D3DTEXTUREADDRESS = Enum("D3DTEXTUREADDRESS", [
     "D3DTADDRESS_WRAP",
     "D3DTADDRESS_MIRROR",
     "D3DTADDRESS_CLAMP",
     "D3DTADDRESS_BORDER",
     "D3DTADDRESS_MIRRORONCE",
     "D3DTADDRESS_FORCE_DWORD",
-))
+])
 
-D3DCULL = Enum("D3DCULL", (
+D3DCULL = Enum("D3DCULL", [
     "D3DCULL_NONE",
     "D3DCULL_CW",
     "D3DCULL_CCW",
     "D3DCULL_FORCE_DWORD",
-))
+])
 
-D3DCMPFUNC = Enum("D3DCMPFUNC", (
+D3DCMPFUNC = Enum("D3DCMPFUNC", [
     "D3DCMP_NEVER",
     "D3DCMP_LESS",
     "D3DCMP_EQUAL",
@@ -194,9 +194,9 @@ D3DCMPFUNC = Enum("D3DCMPFUNC", (
     "D3DCMP_GREATEREQUAL",
     "D3DCMP_ALWAYS",
     "D3DCMP_FORCE_DWORD",
-))
+])
 
-D3DSTENCILOP = Enum("D3DSTENCILOP", (
+D3DSTENCILOP = Enum("D3DSTENCILOP", [
     "D3DSTENCILOP_KEEP",
     "D3DSTENCILOP_ZERO",
     "D3DSTENCILOP_REPLACE",
@@ -206,25 +206,24 @@ D3DSTENCILOP = Enum("D3DSTENCILOP", (
     "D3DSTENCILOP_INCR",
     "D3DSTENCILOP_DECR",
     "D3DSTENCILOP_FORCE_DWORD",
-))
+])
 
-D3DFOGMODE = Enum("D3DFOGMODE", (
+D3DFOGMODE = Enum("D3DFOGMODE", [
     "D3DFOG_NONE",
     "D3DFOG_EXP",
     "D3DFOG_EXP2",
     "D3DFOG_LINEAR",
     "D3DFOG_FORCE_DWORD",
-))
+])
 
-D3DZBUFFERTYPE = Enum("D3DZBUFFERTYPE", (
+D3DZBUFFERTYPE = Enum("D3DZBUFFERTYPE", [
     "D3DZB_FALSE",
     "D3DZB_TRUE",
     "D3DZB_USEW",
     "D3DZB_FORCE_DWORD",
-))
+])
 
-
-D3DPRIMITIVETYPE = Enum("D3DPRIMITIVETYPE", (
+D3DPRIMITIVETYPE = Enum("D3DPRIMITIVETYPE", [
     "D3DPT_POINTLIST",
     "D3DPT_LINELIST",
     "D3DPT_LINESTRIP",
@@ -232,9 +231,9 @@ D3DPRIMITIVETYPE = Enum("D3DPRIMITIVETYPE", (
     "D3DPT_TRIANGLESTRIP",
     "D3DPT_TRIANGLEFAN",
     "D3DPT_FORCE_DWORD",
-))
+])
 
-D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", (
+D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", [
     "D3DTS_VIEW",
     "D3DTS_PROJECTION",
     "D3DTS_TEXTURE0",
@@ -246,17 +245,17 @@ D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", (
     "D3DTS_TEXTURE6",
     "D3DTS_TEXTURE7",
     "D3DTS_FORCE_DWORD",
-))
+])
 
-D3DTS = Flags(DWORD, (
+D3DTS = Flags(DWORD, [
     "D3DTS_WORLDMATRIX(index)",
     "D3DTS_WORLD",
     "D3DTS_WORLD1",
     "D3DTS_WORLD2",
     "D3DTS_WORLD3",
-))
+])
 
-D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", (
+D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [
     "D3DRS_ZENABLE",
     "D3DRS_FILLMODE",
     "D3DRS_SHADEMODE",
@@ -334,37 +333,36 @@ D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", (
     "D3DRS_POSITIONORDER",
     "D3DRS_NORMALORDER",
     "D3DRS_FORCE_DWORD",
-))
-
+])
 
-D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", (
+D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [
     "D3DMCS_MATERIAL",
     "D3DMCS_COLOR1",
     "D3DMCS_COLOR2",
     "D3DMCS_FORCE_DWORD",
-))
+])
 
-D3DWRAP = Flags(DWORD, (
+D3DWRAP = Flags(DWORD, [
     "D3DWRAP_U",
     "D3DWRAP_V",
     "D3DWRAP_W",
-))
+])
 
-D3DWRAPCOORD = Flags(DWORD, (
+D3DWRAPCOORD = Flags(DWORD, [
     "D3DWRAPCOORD_0",
     "D3DWRAPCOORD_1",
     "D3DWRAPCOORD_2",
     "D3DWRAPCOORD_3",
-))
+])
 
-D3DCOLORWRITEENABLE = Flags(DWORD, (
+D3DCOLORWRITEENABLE = Flags(DWORD, [
     "D3DCOLORWRITEENABLE_RED",
     "D3DCOLORWRITEENABLE_GREEN",
     "D3DCOLORWRITEENABLE_BLUE",
     "D3DCOLORWRITEENABLE_ALPHA",
-))
+])
 
-D3DTEXTURESTAGESTATETYPE = Enum("D3DTEXTURESTAGESTATETYPE", (
+D3DTEXTURESTAGESTATETYPE = Enum("D3DTEXTURESTAGESTATETYPE", [
     "D3DTSS_COLOROP",
     "D3DTSS_COLORARG1",
     "D3DTSS_COLORARG2",
@@ -393,16 +391,16 @@ D3DTEXTURESTAGESTATETYPE = Enum("D3DTEXTURESTAGESTATETYPE", (
     "D3DTSS_ALPHAARG0",
     "D3DTSS_RESULTARG",
     "D3DTSS_FORCE_DWORD",
-))
+])
 
-D3DTSS = Flags(DWORD, (
+D3DTSS = Flags(DWORD, [
     "D3DTSS_TCI_PASSTHRU",
     "D3DTSS_TCI_CAMERASPACENORMAL",
     "D3DTSS_TCI_CAMERASPACEPOSITION",
     "D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR",
-))
+])
 
-D3DTEXTUREOP = Enum("D3DTEXTUREOP", (
+D3DTEXTUREOP = Enum("D3DTEXTUREOP", [
     "D3DTOP_DISABLE",
     "D3DTOP_SELECTARG1",
     "D3DTOP_SELECTARG2",
@@ -430,9 +428,9 @@ D3DTEXTUREOP = Enum("D3DTEXTUREOP", (
     "D3DTOP_MULTIPLYADD",
     "D3DTOP_LERP",
     "D3DTOP_FORCE_DWORD",
-))
+])
 
-D3DTA = Flags(DWORD, (
+D3DTA = Flags(DWORD, [
     "D3DTA_SELECTMASK",
     "D3DTA_DIFFUSE",
     "D3DTA_CURRENT",
@@ -442,9 +440,9 @@ D3DTA = Flags(DWORD, (
     "D3DTA_TEMP",
     "D3DTA_COMPLEMENT",
     "D3DTA_ALPHAREPLICATE",
-))
+])
 
-D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", (
+D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", [
     "D3DTEXF_NONE",
     "D3DTEXF_POINT",
     "D3DTEXF_LINEAR",
@@ -452,13 +450,13 @@ D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", (
     "D3DTEXF_FLATCUBIC",
     "D3DTEXF_GAUSSIANCUBIC",
     "D3DTEXF_FORCE_DWORD",
-))
+])
 
-D3DPV = Flags(DWORD, (
+D3DPV = Flags(DWORD, [
     "D3DPV_DONOTCOPYDATA",
-))
+])
 
-D3DFVF = Flags(DWORD, (
+D3DFVF = Flags(DWORD, [
     "D3DFVF_RESERVED0",
     "D3DFVF_POSITION_MASK",
     "D3DFVF_XYZ",
@@ -501,9 +499,9 @@ D3DFVF = Flags(DWORD, (
     "D3DFVF_TEXCOORDSIZE2(3)",
     "D3DFVF_TEXCOORDSIZE4(3)",
     "D3DFVF_TEXCOORDSIZE1(3)",
-))
+])
 
-D3DVSD_TOKENTYPE = Enum("D3DVSD_TOKENTYPE", (
+D3DVSD_TOKENTYPE = Enum("D3DVSD_TOKENTYPE", [
     "D3DVSD_TOKEN_NOP",
     "D3DVSD_TOKEN_STREAM",
     "D3DVSD_TOKEN_STREAMDATA",
@@ -512,9 +510,9 @@ D3DVSD_TOKENTYPE = Enum("D3DVSD_TOKENTYPE", (
     "D3DVSD_TOKEN_EXT",
     "D3DVSD_TOKEN_END",
     "D3DVSD_FORCE_DWORD",
-))
+])
 
-D3DVSDT = Flags(DWORD, (
+D3DVSDT = Flags(DWORD, [
     "D3DVSDT_FLOAT1",
     "D3DVSDT_FLOAT2",
     "D3DVSDT_FLOAT3",
@@ -542,9 +540,9 @@ D3DVSDT = Flags(DWORD, (
     "D3DVSDE_NORMAL2",
     "D3DDP_MAXTEXCOORD",
     "D3DSI_OPCODE_MASK",
-))
+])
 
-D3DSHADER_INSTRUCTION_OPCODE_TYPE = Enum("D3DSHADER_INSTRUCTION_OPCODE_TYPE", (
+D3DSHADER_INSTRUCTION_OPCODE_TYPE = Enum("D3DSHADER_INSTRUCTION_OPCODE_TYPE", [
     "D3DSIO_NOP",
     "D3DSIO_MOV",
     "D3DSIO_ADD",
@@ -600,23 +598,23 @@ D3DSHADER_INSTRUCTION_OPCODE_TYPE = Enum("D3DSHADER_INSTRUCTION_OPCODE_TYPE", (
     "D3DSIO_COMMENT",
     "D3DSIO_END",
     "D3DSIO_FORCE_DWORD",
-))
+])
 
-D3DSP = Flags(DWORD, (
+D3DSP = Flags(DWORD, [
     "D3DSP_WRITEMASK_0",
     "D3DSP_WRITEMASK_1",
     "D3DSP_WRITEMASK_2",
     "D3DSP_WRITEMASK_3",
     "D3DSP_WRITEMASK_ALL",
-))
+])
 
-D3DSHADER_PARAM_DSTMOD_TYPE = Enum("D3DSHADER_PARAM_DSTMOD_TYPE", (
+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", (
+D3DSHADER_PARAM_REGISTER_TYPE = Enum("D3DSHADER_PARAM_REGISTER_TYPE", [
     "D3DSPR_TEMP",
     "D3DSPR_INPUT",
     "D3DSPR_CONST",
@@ -626,22 +624,22 @@ D3DSHADER_PARAM_REGISTER_TYPE = Enum("D3DSHADER_PARAM_REGISTER_TYPE", (
     "D3DSPR_ATTROUT",
     "D3DSPR_TEXCRDOUT",
     "D3DSPR_FORCE_DWORD",
-))
+])
 
-D3DVS_RASTOUT_OFFSETS = Enum("D3DVS_RASTOUT_OFFSETS", (
+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_ADDRESSMODE_TYPE = Enum("D3DVS_ADDRESSMODE_TYPE", [
     "D3DVS_ADDRMODE_ABSOLUTE",
     "D3DVS_ADDRMODE_RELATIVE",
     "D3DVS_ADDRMODE_FORCE_DWORD",
-))
+])
 
-D3DVS = Flags(DWORD, (
+D3DVS = Flags(DWORD, [
     "D3DVS_X_X",
     "D3DVS_X_Y",
     "D3DVS_X_Z",
@@ -659,17 +657,17 @@ D3DVS = Flags(DWORD, (
     "D3DVS_W_Z",
     "D3DVS_W_W",
     "D3DVS_NOSWIZZLE",
-))
+])
 
-D3DSP = Flags(DWORD, (
+D3DSP = Flags(DWORD, [
     "D3DSP_NOSWIZZLE",
     "D3DSP_REPLICATERED",
     "D3DSP_REPLICATEGREEN",
     "D3DSP_REPLICATEBLUE",
     "D3DSP_REPLICATEALPHA",
-))
+])
 
-D3DSHADER_PARAM_SRCMOD_TYPE = Enum("D3DSHADER_PARAM_SRCMOD_TYPE", (
+D3DSHADER_PARAM_SRCMOD_TYPE = Enum("D3DSHADER_PARAM_SRCMOD_TYPE", [
     "D3DSPSM_NONE",
     "D3DSPSM_NEG",
     "D3DSPSM_BIAS",
@@ -682,37 +680,37 @@ D3DSHADER_PARAM_SRCMOD_TYPE = Enum("D3DSHADER_PARAM_SRCMOD_TYPE", (
     "D3DSPSM_DZ",
     "D3DSPSM_DW",
     "D3DSPSM_FORCE_DWORD",
-))
+])
 
-D3DBASISTYPE = Enum("D3DBASISTYPE", (
+D3DBASISTYPE = Enum("D3DBASISTYPE", [
     "D3DBASIS_BEZIER",
     "D3DBASIS_BSPLINE",
     "D3DBASIS_INTERPOLATE",
     "D3DBASIS_FORCE_DWORD",
-))
+])
 
-D3DORDERTYPE = Enum("D3DORDERTYPE", (
+D3DORDERTYPE = Enum("D3DORDERTYPE", [
     "D3DORDER_LINEAR",
     "D3DORDER_QUADRATIC",
     "D3DORDER_CUBIC",
     "D3DORDER_QUINTIC",
     "D3DORDER_FORCE_DWORD",
-))
+])
 
-D3DPATCHEDGESTYLE = Enum("D3DPATCHEDGESTYLE", (
+D3DPATCHEDGESTYLE = Enum("D3DPATCHEDGESTYLE", [
     "D3DPATCHEDGE_DISCRETE",
     "D3DPATCHEDGE_CONTINUOUS",
     "D3DPATCHEDGE_FORCE_DWORD",
-))
+])
 
-D3DSTATEBLOCKTYPE = Enum("D3DSTATEBLOCKTYPE", (
+D3DSTATEBLOCKTYPE = Enum("D3DSTATEBLOCKTYPE", [
     "D3DSBT_ALL",
     "D3DSBT_PIXELSTATE",
     "D3DSBT_VERTEXSTATE",
     "D3DSBT_FORCE_DWORD",
-))
+])
 
-D3DVERTEXBLENDFLAGS = Enum("D3DVERTEXBLENDFLAGS", (
+D3DVERTEXBLENDFLAGS = Enum("D3DVERTEXBLENDFLAGS", [
     "D3DVBF_DISABLE",
     "D3DVBF_1WEIGHTS",
     "D3DVBF_2WEIGHTS",
@@ -720,9 +718,9 @@ D3DVERTEXBLENDFLAGS = Enum("D3DVERTEXBLENDFLAGS", (
     "D3DVBF_TWEENING",
     "D3DVBF_0WEIGHTS",
     "D3DVBF_FORCE_DWORD",
-))
+])
 
-D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", (
+D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", [
     "D3DTTFF_DISABLE",
     "D3DTTFF_COUNT1",
     "D3DTTFF_COUNT2",
@@ -730,16 +728,16 @@ D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", (
     "D3DTTFF_COUNT4",
     "D3DTTFF_PROJECTED",
     "D3DTTFF_FORCE_DWORD",
-))
+])
 
-D3DDEVTYPE = Enum("D3DDEVTYPE", (
+D3DDEVTYPE = Enum("D3DDEVTYPE", [
     "D3DDEVTYPE_HAL",
     "D3DDEVTYPE_REF",
     "D3DDEVTYPE_SW",
     "D3DDEVTYPE_FORCE_DWORD",
-))
+])
 
-D3DMULTISAMPLE_TYPE = Enum("D3DMULTISAMPLE_TYPE", (
+D3DMULTISAMPLE_TYPE = Enum("D3DMULTISAMPLE_TYPE", [
     "D3DMULTISAMPLE_NONE",
     "D3DMULTISAMPLE_2_SAMPLES",
     "D3DMULTISAMPLE_3_SAMPLES",
@@ -757,9 +755,9 @@ D3DMULTISAMPLE_TYPE = Enum("D3DMULTISAMPLE_TYPE", (
     "D3DMULTISAMPLE_15_SAMPLES",
     "D3DMULTISAMPLE_16_SAMPLES",
     "D3DMULTISAMPLE_FORCE_DWORD",
-))
+])
 
-D3DFORMAT = Enum("D3DFORMAT", (
+D3DFORMAT = Enum("D3DFORMAT", [
     "D3DFMT_UNKNOWN",
     "D3DFMT_R8G8B8",
     "D3DFMT_A8R8G8B8",
@@ -804,44 +802,44 @@ D3DFORMAT = Enum("D3DFORMAT", (
     "D3DFMT_INDEX16",
     "D3DFMT_INDEX32",
     "D3DFMT_FORCE_DWORD",
-))
+])
 
-D3DDISPLAYMODE = Struct("D3DDISPLAYMODE", (
+D3DDISPLAYMODE = Struct("D3DDISPLAYMODE", [
     (UINT, "Width"),
     (UINT, "Height"),
     (UINT, "RefreshRate"),
     (D3DFORMAT, "Format"),
-))
+])
 
-D3DDEVICE_CREATION_PARAMETERS = Struct("D3DDEVICE_CREATION_PARAMETERS", (
+D3DDEVICE_CREATION_PARAMETERS = Struct("D3DDEVICE_CREATION_PARAMETERS", [
     (UINT, "AdapterOrdinal"),
     (D3DDEVTYPE, "DeviceType"),
     (HWND, "hFocusWindow"),
     (DWORD, "BehaviorFlags"),
-))
+])
 
-D3DSWAPEFFECT = Enum("D3DSWAPEFFECT", (
+D3DSWAPEFFECT = Enum("D3DSWAPEFFECT", [
     "D3DSWAPEFFECT_DISCARD",
     "D3DSWAPEFFECT_FLIP",
     "D3DSWAPEFFECT_COPY",
     "D3DSWAPEFFECT_COPY_VSYNC",
     "D3DSWAPEFFECT_FORCE_DWORD",
-))
+])
 
-D3DPOOL = Enum("D3DPOOL", (
+D3DPOOL = Enum("D3DPOOL", [
     "D3DPOOL_DEFAULT",
     "D3DPOOL_MANAGED",
     "D3DPOOL_SYSTEMMEM",
     "D3DPOOL_SCRATCH",
     "D3DPOOL_FORCE_DWORD",
-))
+])
 
-D3DPRESENT = Flags(DWORD, (
+D3DPRESENT = Flags(DWORD, [
     "D3DPRESENT_RATE_DEFAULT",
     "D3DPRESENT_RATE_UNLIMITED",
-))
+])
 
-D3DPRESENT_PARAMETERS = Struct("D3DPRESENT_PARAMETERS", (
+D3DPRESENT_PARAMETERS = Struct("D3DPRESENT_PARAMETERS", [
     (UINT, "BackBufferWidth"),
     (UINT, "BackBufferHeight"),
     (D3DFORMAT, "BackBufferFormat"),
@@ -855,28 +853,26 @@ D3DPRESENT_PARAMETERS = Struct("D3DPRESENT_PARAMETERS", (
     (DWORD, "Flags"),
     (UINT, "FullScreen_RefreshRateInHz"),
     (UINT, "FullScreen_PresentationInterval"),
+])
 
-))
-
-D3DPRESENTFLAG = Flags(DWORD, (
+D3DPRESENTFLAG = Flags(DWORD, [
     "D3DPRESENTFLAG_LOCKABLE_BACKBUFFER",
-))
+])
 
-D3DGAMMARAMP = Struct("D3DGAMMARAMP", (
+D3DGAMMARAMP = Struct("D3DGAMMARAMP", [
     (WORD, "red[256]"),
     (WORD, "green[256]"),
     (WORD, "blue[256]"),
-))
+])
 
-D3DBACKBUFFER_TYPE = Enum("D3DBACKBUFFER_TYPE", (
+D3DBACKBUFFER_TYPE = Enum("D3DBACKBUFFER_TYPE", [
     "D3DBACKBUFFER_TYPE_MONO",
     "D3DBACKBUFFER_TYPE_LEFT",
     "D3DBACKBUFFER_TYPE_RIGHT",
-
     "D3DBACKBUFFER_TYPE_FORCE_DWORD",
-))
+])
 
-D3DRESOURCETYPE = Enum("D3DRESOURCETYPE", (
+D3DRESOURCETYPE = Enum("D3DRESOURCETYPE", [
     "D3DRTYPE_SURFACE",
     "D3DRTYPE_VOLUME",
     "D3DRTYPE_TEXTURE",
@@ -885,9 +881,9 @@ D3DRESOURCETYPE = Enum("D3DRESOURCETYPE", (
     "D3DRTYPE_VERTEXBUFFER",
     "D3DRTYPE_INDEXBUFFER",
     "D3DRTYPE_FORCE_DWORD",
-))
+])
 
-D3DUSAGE = Flags(DWORD, (
+D3DUSAGE = Flags(DWORD, [
     "D3DUSAGE_RENDERTARGET",
     "D3DUSAGE_DEPTHSTENCIL",
     "D3DUSAGE_WRITEONLY",
@@ -897,9 +893,9 @@ D3DUSAGE = Flags(DWORD, (
     "D3DUSAGE_RTPATCHES",
     "D3DUSAGE_NPATCHES",
     "D3DUSAGE_DYNAMIC",
-))
+])
 
-D3DCUBEMAP_FACES = Enum("D3DCUBEMAP_FACES", (
+D3DCUBEMAP_FACES = Enum("D3DCUBEMAP_FACES", [
     "D3DCUBEMAP_FACE_POSITIVE_X",
     "D3DCUBEMAP_FACE_NEGATIVE_X",
     "D3DCUBEMAP_FACE_POSITIVE_Y",
@@ -907,34 +903,34 @@ D3DCUBEMAP_FACES = Enum("D3DCUBEMAP_FACES", (
     "D3DCUBEMAP_FACE_POSITIVE_Z",
     "D3DCUBEMAP_FACE_NEGATIVE_Z",
     "D3DCUBEMAP_FACE_FORCE_DWORD",
-))
+])
 
-D3DLOCK = Flags(DWORD, (
+D3DLOCK = Flags(DWORD, [
     "D3DLOCK_READONLY",
     "D3DLOCK_DISCARD",
     "D3DLOCK_NOOVERWRITE",
     "D3DLOCK_NOSYSLOCK",
     "D3DLOCK_NO_DIRTY_UPDATE",
-))
+])
 
-D3DVERTEXBUFFER_DESC = Struct("D3DVERTEXBUFFER_DESC", (
+D3DVERTEXBUFFER_DESC = Struct("D3DVERTEXBUFFER_DESC", [
     (D3DFORMAT, "Format"),
     (D3DRESOURCETYPE, "Type"),
     (DWORD, "Usage"),
     (D3DPOOL, "Pool"),
     (UINT, "Size"),
     (DWORD, "FVF"),
-))
+])
 
-D3DINDEXBUFFER_DESC = Struct("D3DINDEXBUFFER_DESC", (
+D3DINDEXBUFFER_DESC = Struct("D3DINDEXBUFFER_DESC", [
     (D3DFORMAT, "Format"),
     (D3DRESOURCETYPE, "Type"),
     (DWORD, "Usage"),
     (D3DPOOL, "Pool"),
     (UINT, "Size"),
-))
+])
 
-D3DSURFACE_DESC = Struct("D3DSURFACE_DESC", (
+D3DSURFACE_DESC = Struct("D3DSURFACE_DESC", [
     (D3DFORMAT, "Format"),
     (D3DRESOURCETYPE, "Type"),
     (DWORD, "Usage"),
@@ -943,9 +939,9 @@ D3DSURFACE_DESC = Struct("D3DSURFACE_DESC", (
     (D3DMULTISAMPLE_TYPE, "MultiSampleType"),
     (UINT, "Width"),
     (UINT, "Height"),
-))
+])
 
-D3DVOLUME_DESC = Struct("D3DVOLUME_DESC", (
+D3DVOLUME_DESC = Struct("D3DVOLUME_DESC", [
     (D3DFORMAT, "Format"),
     (D3DRESOURCETYPE, "Type"),
     (DWORD, "Usage"),
@@ -954,34 +950,34 @@ D3DVOLUME_DESC = Struct("D3DVOLUME_DESC", (
     (UINT, "Width"),
     (UINT, "Height"),
     (UINT, "Depth"),
-))
+])
 
-D3DLOCKED_RECT = Struct("D3DLOCKED_RECT", (
+D3DLOCKED_RECT = Struct("D3DLOCKED_RECT", [
     (INT, "Pitch"),
     (PVOID, "pBits"),
-))
+])
 
-D3DBOX = Struct("D3DBOX", (
+D3DBOX = Struct("D3DBOX", [
     (UINT, "Left"),
     (UINT, "Top"),
     (UINT, "Right"),
     (UINT, "Bottom"),
     (UINT, "Front"),
     (UINT, "Back"),
-))
+])
 
-D3DLOCKED_BOX = Struct("D3DLOCKED_BOX", (
+D3DLOCKED_BOX = Struct("D3DLOCKED_BOX", [
     (INT, "RowPitch"),
     (INT, "SlicePitch"),
     (PVOID, "pBits"),
-))
+])
 
-D3DRANGE = Struct("D3DRANGE", (
+D3DRANGE = Struct("D3DRANGE", [
     (UINT, "Offset"),
     (UINT, "Size"),
-))
+])
 
-D3DRECTPATCH_INFO = Struct("D3DRECTPATCH_INFO", (
+D3DRECTPATCH_INFO = Struct("D3DRECTPATCH_INFO", [
     (UINT, "StartVertexOffsetWidth"),
     (UINT, "StartVertexOffsetHeight"),
     (UINT, "Width"),
@@ -989,16 +985,16 @@ D3DRECTPATCH_INFO = Struct("D3DRECTPATCH_INFO", (
     (UINT, "Stride"),
     (D3DBASISTYPE, "Basis"),
     (D3DORDERTYPE, "Order"),
-))
+])
 
-D3DTRIPATCH_INFO = Struct("D3DTRIPATCH_INFO", (
+D3DTRIPATCH_INFO = Struct("D3DTRIPATCH_INFO", [
     (UINT, "StartVertexOffset"),
     (UINT, "NumVertices"),
     (D3DBASISTYPE, "Basis"),
     (D3DORDERTYPE, "Order"),
-))
+])
 
-D3DADAPTER_IDENTIFIER8 = Struct("D3DADAPTER_IDENTIFIER8", (
+D3DADAPTER_IDENTIFIER8 = Struct("D3DADAPTER_IDENTIFIER8", [
     (String, "Driver"),
     (String, "Description"),
     (LARGE_INTEGER, "DriverVersion"),
@@ -1008,25 +1004,25 @@ D3DADAPTER_IDENTIFIER8 = Struct("D3DADAPTER_IDENTIFIER8", (
     (DWORD, "Revision"),
     (GUID, "DeviceIdentifier"),
     (DWORD, "WHQLLevel"),
-))
+])
 
-D3DRASTER_STATUS = Struct("D3DRASTER_STATUS", (
+D3DRASTER_STATUS = Struct("D3DRASTER_STATUS", [
     (BOOL, "InVBlank"),
     (UINT, "ScanLine"),
-))
+])
 
-D3DDEBUGMONITORTOKENS = Enum("D3DDEBUGMONITORTOKENS", (
+D3DDEBUGMONITORTOKENS = Enum("D3DDEBUGMONITORTOKENS", [
     "D3DDMT_ENABLE",
     "D3DDMT_DISABLE",
     "D3DDMT_FORCE_DWORD",
-))
+])
 
-D3DDEVINFOID = Flags(DWORD, (
+D3DDEVINFOID = Flags(DWORD, [
     "D3DDEVINFOID_RESOURCEMANAGER",
     "D3DDEVINFOID_VERTEXSTATS",
-))
+])
 
-D3DRESOURCESTATS = Struct("D3DRESOURCESTATS", (
+D3DRESOURCESTATS = Struct("D3DRESOURCESTATS", [
     (BOOL, "bThrashing"),
     (DWORD, "ApproxBytesDownloaded"),
     (DWORD, "NumEvicts"),
@@ -1038,14 +1034,14 @@ D3DRESOURCESTATS = Struct("D3DRESOURCESTATS", (
     (DWORD, "WorkingSetBytes"),
     (DWORD, "TotalManaged"),
     (DWORD, "TotalBytes"),
-))
+])
 
-D3DDEVINFO_RESOURCEMANAGER = Struct("D3DDEVINFO_RESOURCEMANAGER", (
+D3DDEVINFO_RESOURCEMANAGER = Struct("D3DDEVINFO_RESOURCEMANAGER", [
     (D3DRESOURCESTATS, "stats[D3DRTYPECOUNT]"),
-))
+])
 
-D3DDEVINFO_D3DVERTEXSTATS = Struct("D3DDEVINFO_D3DVERTEXSTATS", (
+D3DDEVINFO_D3DVERTEXSTATS = Struct("D3DDEVINFO_D3DVERTEXSTATS", [
     (DWORD, "NumRenderedTriangles"),
     (DWORD, "NumExtraClippingTriangles"),
-))
+])