Fix spec of arrays in D3D.

diff --git a/d3d8types.py b/d3d8types.py
index 2333918cc7a0b70f7c7aaace9351fa03e6c172d0..a4dbb52cda38ab1a8bbe642479fd519e6a925e6b 100644 (file)
--- a/d3d8types.py
+++ b/d3d8types.py
@@ -828,9 +828,9 @@ 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", [
@@ -1001,7 +1001,7 @@ D3DRESOURCESTATS = Struct("D3DRESOURCESTATS", [
 ])
 
 D3DDEVINFO_RESOURCEMANAGER = Struct("D3DDEVINFO_RESOURCEMANAGER", [
-    (D3DRESOURCESTATS, "stats[D3DRTYPECOUNT]"),
+    (Array(D3DRESOURCESTATS, "D3DRTYPECOUNT"), "stats"),
 ])
 
 D3DDEVINFO_D3DVERTEXSTATS = Struct("D3DDEVINFO_D3DVERTEXSTATS", [

diff --git a/d3d9types.py b/d3d9types.py
index fc72ce113523246e33411265d5f2bce5436bc71a..73011ee36f5945aef4d2e691f1819ddce9e59b52 100644 (file)
--- a/d3d9types.py
+++ b/d3d9types.py
@@ -999,9 +999,9 @@ 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", [
@@ -1205,8 +1205,7 @@ D3DRESOURCESTATS = Struct("D3DRESOURCESTATS", [
 ])
 
 D3DDEVINFO_RESOURCEMANAGER = Struct("D3DDEVINFO_RESOURCEMANAGER", [
-    (D3DRESOURCESTATS, "stats[D3DRTYPECOUNT]"),
-    (D3DRESOURCESTATS, "stats[8]"),
+    (Array(D3DRESOURCESTATS, "D3DRTYPECOUNT"), "stats"),
 ])
 
 D3DDEVINFO_D3DVERTEXSTATS = Struct("D3DDEVINFO_D3DVERTEXSTATS", [

diff --git a/d3dtypes.py b/d3dtypes.py
index 61e952a655f045a755cd4f266a6533589f0b2a5e..3f40f42a0a08dc228f29fc35d2c07e24d8f9556c 100644 (file)
--- a/d3dtypes.py
+++ b/d3dtypes.py
@@ -116,7 +116,7 @@ D3DVERTEX = Struct("D3DVERTEX", [
 LPD3DVERTEX = Pointer(D3DVERTEX)
 
 D3DMATRIX = Struct("D3DMATRIX", [
-    (D3DVALUE, "m[4][4]"),
+    (Array(Array(D3DVALUE, "4"), "4"), "m"),
 ])
 LPD3DMATRIX = Pointer(D3DMATRIX)
 
@@ -663,8 +663,8 @@ D3DSTATE = Struct("D3DSTATE", [
     (D3DTRANSFORMSTATETYPE, "dtstTransformStateType"),
     (D3DLIGHTSTATETYPE, "dlstLightStateType"),
     (D3DRENDERSTATETYPE, "drstRenderStateType"),
-    (DWORD, "dwArg[1]"),
-    (D3DVALUE, "dvArg[1]"),
+    (Array(DWORD, "1"), "dwArg"),
+    (Array(D3DVALUE, "1"), "dvArg"),
 ])
 
 D3DMATRIXLOAD = Struct("D3DMATRIXLOAD", [
@@ -965,7 +965,7 @@ D3DDRAWPRIMITIVESTRIDEDDATA = Struct("D3DDRAWPRIMITIVESTRIDEDDATA", [
     (D3DDP_PTRSTRIDE, "normal"),
     (D3DDP_PTRSTRIDE, "diffuse"),
     (D3DDP_PTRSTRIDE, "specular"),
-    (D3DDP_PTRSTRIDE, "textureCoords[D3DDP_MAXTEXCOORD]"),
+    (Array(D3DDP_PTRSTRIDE, "D3DDP_MAXTEXCOORD"), "textureCoords"),
 ])
 LPD3DDRAWPRIMITIVESTRIDEDDATA = Pointer(D3DDRAWPRIMITIVESTRIDEDDATA)