Use skiplist-based FastCallSet within trace::CallSet

[apitrace] / specs / ddraw.py

diff --git a/specs/ddraw.py b/specs/ddraw.py
index cccbbe57fd73540eee7dfa37291f911469546763..1b224763ed48d2f42742995f92cbc199db8a2dd7 100644 (file)
--- a/specs/ddraw.py
+++ b/specs/ddraw.py
@@ -455,8 +455,10 @@ DDPIXELFORMAT = Struct("DDPIXELFORMAT", [
     (DWORD, "dwUBitMask"),
     (DWORD, "dwZBitMask"),
     (DWORD, "dwBumpDvBitMask"),
-    (WORD, "MultiSampleCaps.wFlipMSTypes"),
-    (WORD, "MultiSampleCaps.wBltMSTypes"),
+    (Struct(None, [
+        (WORD, "wFlipMSTypes"),
+        (WORD, "wBltMSTypes"),
+    ]), "MultiSampleCaps"),
     (DWORD, "dwBBitMask"),
     (DWORD, "dwVBitMask"),
     (DWORD, "dwStencilBitMask"),
@@ -1632,7 +1634,7 @@ DDCREATE = Flags(DWORD, [
     "DDCREATE_EMULATIONONLY",
 ])
 
-ddraw = API("ddraw")
+ddraw = Module("ddraw")
 ddraw.addFunctions([
     StdFunction(HRESULT, "DirectDrawEnumerateW", [(LPDDENUMCALLBACKW, "lpCallback"), (LPVOID, "lpContext")]),
     StdFunction(HRESULT, "DirectDrawEnumerateA", [(LPDDENUMCALLBACKA, "lpCallback"), (LPVOID, "lpContext")]),
@@ -1641,8 +1643,8 @@ ddraw.addFunctions([
     StdFunction(HRESULT, "DirectDrawCreate", [(Pointer(GUID), "lpGUID"), Out(Pointer(LPDIRECTDRAW), "lplpDD"), (LPUNKNOWN, "pUnkOuter")]),
     StdFunction(HRESULT, "DirectDrawCreateEx", [(Pointer(GUID), "lpGuid"), Out(Pointer(ObjPointer(Void)), "lplpDD"), (REFIID, "iid"), (LPUNKNOWN, "pUnkOuter")]),
     StdFunction(HRESULT, "DirectDrawCreateClipper", [(DWORD, "dwFlags"), Out(Pointer(LPDIRECTDRAWCLIPPER), "lplpDDClipper"), (LPUNKNOWN, "pUnkOuter")]),
-    StdFunction(Void, "AcquireDDThreadLock", []),
-    StdFunction(Void, "ReleaseDDThreadLock", []),
+    StdFunction(Void, "AcquireDDThreadLock", [], internal=True),
+    StdFunction(Void, "ReleaseDDThreadLock", [], internal=True),
     StdFunction(DWORD, "D3DParseUnknownCommand", [(LPVOID, "lpCmd"), Out(Pointer(LPVOID), "lpRetCmd")]),
     StdFunction(HRESULT, "DllCanUnloadNow", []),
     StdFunction(HRESULT, "DllGetClassObject", [(REFCLSID, "rclsid"), (REFIID, "riid"), Out(Pointer(ObjPointer(Void)), "ppv")]),