Merge branch 'master' into d2d

[apitrace] / specs / winapi.py

diff --git a/specs/winapi.py b/specs/winapi.py
index 17256aaec759c7eeabad190e46735ef0503ff1f1..017cf5f0e527dab0094998a44326c6404e638f1e 100644 (file)
--- a/specs/winapi.py
+++ b/specs/winapi.py
@@ -45,11 +45,11 @@ UINT32 = Alias("UINT32", UInt32)
 INT64 = Alias("INT64", Int64)
 UINT64 = Alias("UINT64", UInt64)
 
-BYTE = Literal("BYTE", "UInt", base=16)
-WORD = Literal("WORD", "UInt", base=16)
-DWORD = Literal("DWORD", "UInt", base=16)
+BYTE = Alias("BYTE", UInt8)
+WORD = Alias("WORD", UInt16)
+DWORD = Alias("DWORD", UInt32)
 
-WCHAR = Literal("WCHAR", "SInt")
+WCHAR = Alias("WCHAR", Short)
 
 BOOL = Alias("BOOL", Bool)
 
@@ -83,7 +83,7 @@ GUID = Struct("GUID", [
     (DWORD, "Data1"),
     (WORD, "Data2"),
     (WORD, "Data3"),
-    (Array(BYTE, "8"), "Data4"),
+    (Array(BYTE, 8), "Data4"),
 ])
 LPGUID = Pointer(GUID)
 
@@ -150,6 +150,30 @@ HMODULE = Opaque("HMODULE")
 
 IUnknown = Interface("IUnknown")
 
+FILETIME = Struct("FILETIME", [
+    (DWORD, "dwLowDateTime"),
+    (DWORD, "dwHighDateTime"),
+])
+
+COLORREF = Alias("COLORREF", DWORD)
+
+LOGFONTW = Struct("LOGFONTW", [
+    (LONG, "lfHeight"),
+    (LONG, "lfWidth"),
+    (LONG, "lfEscapement"),
+    (LONG, "lfOrientation"),
+    (LONG, "lfWeight"),
+    (BYTE, "lfItalic"),
+    (BYTE, "lfUnderline"),
+    (BYTE, "lfStrikeOut"),
+    (BYTE, "lfCharSet"),
+    (BYTE, "lfOutPrecision"),
+    (BYTE, "lfClipPrecision"),
+    (BYTE, "lfQuality"),
+    (BYTE, "lfPitchAndFamily"),
+    (WString, "lfFaceName"),
+])
+
 HRESULT_com = FakeEnum(HRESULT, [
     "S_OK",
     "E_NOINTERFACE",