X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=winapi.py;h=ee9c91f94b0ecbcc96d925eecd3d44eee6f3e9f0;hb=c5b741c83e804f1e438caca83565a76e254d0b94;hp=ee619821aff8fd3992838d824b368fe4f5589c50;hpb=8384ccb5de91cf5b3dcc16d4a3ef2830c6113ad5;p=apitrace

diff --git a/winapi.py b/winapi.py
index ee61982..ee9c91f 100644
--- a/winapi.py
+++ b/winapi.py
@@ -36,7 +36,7 @@ ULONG = Alias("ULONG", ULong)
 LONGLONG = Alias("LONGLONG", LongLong)
 FLOAT = Alias("FLOAT", Float)
 
-INT32 = Literal("INT32", "UInt")
+INT32 = Literal("INT32", "SInt")
 UINT32 = Literal("UINT32", "UInt")
 
 BYTE = Literal("BYTE", "UInt", base=16)
@@ -76,14 +76,7 @@ GUID = Struct("GUID", [
     (DWORD, "Data1"),
     (WORD, "Data2"),
     (WORD, "Data3"),
-    (BYTE, "Data4[0]"),
-    (BYTE, "Data4[1]"),
-    (BYTE, "Data4[2]"),
-    (BYTE, "Data4[3]"),
-    (BYTE, "Data4[4]"),
-    (BYTE, "Data4[5]"),
-    (BYTE, "Data4[6]"),
-    (BYTE, "Data4[7]"),
+    (Array(BYTE, "8"), "Data4"),
 ])
 LPGUID = Pointer(GUID)
 
@@ -150,8 +143,14 @@ HMODULE = Opaque("HMODULE")
 
 IUnknown = Interface("IUnknown")
 
+HRESULT_com = FakeEnum(HRESULT, [
+    "S_OK",
+    "E_NOINTERFACE",
+    "E_POINTER",
+])
+
 IUnknown.methods = (
-	Method(HRESULT, "QueryInterface", ((REFIID, "riid"), (Pointer(OpaquePointer(Void)), "ppvObj"))),
+	Method(HRESULT_com, "QueryInterface", ((REFIID, "riid"), Out(Pointer(OpaquePointer(Void)), "ppvObj"))),
 	Method(ULONG, "AddRef", ()),
 	Method(ULONG, "Release", ()),
 )