X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=d3d9types.py;h=3aacc7ef51c2e3a5984c5179b99f13d2783f6251;hb=50a46e299da3756c0e8f5563efc8c479dad2178a;hp=e9e128099d8237aef066905c71d388bd5e3d2cab;hpb=31524197f9120f57c7df45525a95fa331194e02c;p=apitrace

diff --git a/d3d9types.py b/d3d9types.py
index e9e1280..3aacc7e 100644
--- a/d3d9types.py
+++ b/d3d9types.py
@@ -25,7 +25,7 @@
 
 """d3d9types.h"""
 
-from windows import *
+from winapi import *
 
 D3DCOLOR = Alias("D3DCOLOR", DWORD)
 
@@ -123,7 +123,7 @@ D3DLIGHT9 = Struct("D3DLIGHT9", [
     (Float, "Phi"),
 ])
 
-D3DCS = Flags(DWORD, [
+D3DCLEAR = Flags(DWORD, [
     "D3DCLEAR_TARGET",
     "D3DCLEAR_ZBUFFER",
     "D3DCLEAR_STENCIL",
@@ -514,36 +514,36 @@ D3DFVF = Flags(DWORD, [
     "D3DFVF_PSIZE",
     "D3DFVF_DIFFUSE",
     "D3DFVF_SPECULAR",
-    "D3DFVF_TEXCOUNT_MASK",
-    "D3DFVF_TEXCOUNT_SHIFT",
-    "D3DFVF_TEX0",
-    "D3DFVF_TEX1",
-    "D3DFVF_TEX2",
-    "D3DFVF_TEX3",
-    "D3DFVF_TEX4",
-    "D3DFVF_TEX5",
-    "D3DFVF_TEX6",
-    "D3DFVF_TEX7",
-    "D3DFVF_TEX8",
+    #"D3DFVF_TEXCOUNT_MASK",
+    #"D3DFVF_TEXCOUNT_SHIFT",
+    #"D3DFVF_TEX0",
+    #"D3DFVF_TEX1",
+    #"D3DFVF_TEX2",
+    #"D3DFVF_TEX3",
+    #"D3DFVF_TEX4",
+    #"D3DFVF_TEX5",
+    #"D3DFVF_TEX6",
+    #"D3DFVF_TEX7",
+    #"D3DFVF_TEX8",
     "D3DFVF_LASTBETA_UBYTE4",
     "D3DFVF_LASTBETA_D3DCOLOR",
     "D3DFVF_RESERVED2",
-    "D3DFVF_TEXCOORDSIZE3(0)",
-    "D3DFVF_TEXCOORDSIZE2(0)",
-    "D3DFVF_TEXCOORDSIZE4(0)",
-    "D3DFVF_TEXCOORDSIZE1(0)",
-    "D3DFVF_TEXCOORDSIZE3(1)",
-    "D3DFVF_TEXCOORDSIZE2(1)",
-    "D3DFVF_TEXCOORDSIZE4(1)",
-    "D3DFVF_TEXCOORDSIZE1(1)",
-    "D3DFVF_TEXCOORDSIZE3(2)",
-    "D3DFVF_TEXCOORDSIZE2(2)",
-    "D3DFVF_TEXCOORDSIZE4(2)",
-    "D3DFVF_TEXCOORDSIZE1(2)",
-    "D3DFVF_TEXCOORDSIZE3(3)",
-    "D3DFVF_TEXCOORDSIZE2(3)",
-    "D3DFVF_TEXCOORDSIZE4(3)",
-    "D3DFVF_TEXCOORDSIZE1(3)",
+    #"D3DFVF_TEXCOORDSIZE3(0)",
+    #"D3DFVF_TEXCOORDSIZE2(0)",
+    #"D3DFVF_TEXCOORDSIZE4(0)",
+    #"D3DFVF_TEXCOORDSIZE1(0)",
+    #"D3DFVF_TEXCOORDSIZE3(1)",
+    #"D3DFVF_TEXCOORDSIZE2(1)",
+    #"D3DFVF_TEXCOORDSIZE4(1)",
+    #"D3DFVF_TEXCOORDSIZE1(1)",
+    #"D3DFVF_TEXCOORDSIZE3(2)",
+    #"D3DFVF_TEXCOORDSIZE2(2)",
+    #"D3DFVF_TEXCOORDSIZE4(2)",
+    #"D3DFVF_TEXCOORDSIZE1(2)",
+    #"D3DFVF_TEXCOORDSIZE3(3)",
+    #"D3DFVF_TEXCOORDSIZE2(3)",
+    #"D3DFVF_TEXCOORDSIZE4(3)",
+    #"D3DFVF_TEXCOORDSIZE1(3)",
 ])
 
 D3DDECLUSAGE = Enum("D3DDECLUSAGE", [
@@ -1171,9 +1171,9 @@ D3DTRIPATCH_INFO = Struct("D3DTRIPATCH_INFO", [
 ])
 
 D3DADAPTER_IDENTIFIER9 = Struct("D3DADAPTER_IDENTIFIER9", [
-    (String, "Driver"),
-    (String, "Description"),
-    (String, "DeviceName"),
+    (CString, "Driver"),
+    (CString, "Description"),
+    (CString, "DeviceName"),
     (LARGE_INTEGER, "DriverVersion"),
     (DWORD, "VendorId"),
     (DWORD, "DeviceId"),