Merge branch 'master' into d2d

[apitrace] / specs / d2d1.py

diff --git a/specs/d2d1.py b/specs/d2d1.py
index 6a527f0553b5add0a33cc1260d2ed32b594f24b0..e7ac8df308556420628744ffe813042f86b3f26a 100644 (file)
--- a/specs/d2d1.py
+++ b/specs/d2d1.py
@@ -105,7 +105,7 @@ D2D1_BITMAP_INTERPOLATION_MODE = Enum("D2D1_BITMAP_INTERPOLATION_MODE", [
 D2D1_DRAW_TEXT_OPTIONS = EnumFlag("D2D1_DRAW_TEXT_OPTIONS", [
     "D2D1_DRAW_TEXT_OPTIONS_NONE",
     "D2D1_DRAW_TEXT_OPTIONS_NO_SNAP",
-    "D2D1_DRAW_TEXT_OPTIONS_NO_CLIP",
+    "D2D1_DRAW_TEXT_OPTIONS_CLIP",
 ])
 
 D2D1_PIXEL_FORMAT = Struct("D2D1_PIXEL_FORMAT", [
@@ -623,8 +623,8 @@ ID2D1Factory.methods += [
 ]
 
 d2d1 = API("d2d1")
-d2d1.add_interface(ID2D1Factory)
-d2d1.add_functions([
+d2d1.addInterface(ID2D1Factory)
+d2d1.addFunctions([
     StdFunction(HRESULT, "D2D1CreateFactory", [(D2D1_FACTORY_TYPE, "factoryType"), (REFIID, "riid"), (Pointer(Const(D2D1_FACTORY_OPTIONS)), "pFactoryOptions"), Out(Pointer(OpaquePointer(Void)), "ppIFactory")]),
     StdFunction(Void, "D2D1MakeRotateMatrix", [(FLOAT, "angle"), (D2D1_POINT_2F, "center"), Out(Pointer(D2D1_MATRIX_3X2_F), "matrix")]),
     StdFunction(Void, "D2D1MakeSkewMatrix", [(FLOAT, "angleX"), (FLOAT, "angleY"), (D2D1_POINT_2F, "center"), Out(Pointer(D2D1_MATRIX_3X2_F), "matrix")]),