Get d2d to build on MinGW.

diff --git a/compat.h b/compat.h
index c7fb3d52a2b95111e7661ab9b417718a9ba5c46f..4573b97794daeb39f2f4daea55cb2bec01785b11 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -50,6 +50,7 @@
 #define __inline __inline__
 #define __deref_out /**/
 #define __deref_out_opt /**/
+#define __deref_out_bcount(x)
 #define __maybenull
 #define __in_z
 #define __in_z_opt
@@ -66,6 +67,8 @@
 #define DECLSPEC_NOVTABLE
 #endif
 
+#include <stdint.h>
+
 #define INT8 int8_t
 #define UINT8 uint8_t
 #define INT16 int16_t

diff --git a/specs/dwrite.py b/specs/dwrite.py
index f7d284be7781f543d87f3a61a4a30b004dc4903b..38fbe21746fa93acd9e831ead69b129625009cac 100644 (file)
--- a/specs/dwrite.py
+++ b/specs/dwrite.py
@@ -462,15 +462,15 @@ IDWriteTextFormat.methods += [
     Method(FLOAT, "GetIncrementalTabStop", []),
     Method(HRESULT, "GetTrimming", [Out(Pointer(DWRITE_TRIMMING), "trimmingOptions"), Out(Pointer(Pointer(IDWriteInlineObject)), "trimmingSign")]),
     Method(HRESULT, "GetLineSpacing", [Out(Pointer(DWRITE_LINE_SPACING_METHOD), "lineSpacingMethod"), Out(Pointer(FLOAT), "lineSpacing"), Out(Pointer(FLOAT), "baseline")]),
-    Method(HRESULT, "GetFontCollection", [Out(Pointer(Pointer(IDWriteFontCollection)), "fontCollection")]),
-    Method(UINT32, "GetFontFamilyNameLength", []),
-    Method(HRESULT, "GetFontFamilyName", [Out(Pointer(WCHAR), "fontFamilyName"), (UINT32, "nameSize")]),
-    Method(DWRITE_FONT_WEIGHT, "GetFontWeight", []),
-    Method(DWRITE_FONT_STYLE, "GetFontStyle", []),
-    Method(DWRITE_FONT_STRETCH, "GetFontStretch", []),
-    Method(FLOAT, "GetFontSize", []),
-    Method(UINT32, "GetLocaleNameLength", []),
-    Method(HRESULT, "GetLocaleName", [Out(Pointer(WCHAR), "localeName"), (UINT32, "nameSize")]),
+    #Method(HRESULT, "GetFontCollection", [Out(Pointer(Pointer(IDWriteFontCollection)), "fontCollection")]),
+    #Method(UINT32, "GetFontFamilyNameLength", []),
+    #Method(HRESULT, "GetFontFamilyName", [Out(Pointer(WCHAR), "fontFamilyName"), (UINT32, "nameSize")]),
+    #Method(DWRITE_FONT_WEIGHT, "GetFontWeight", []),
+    #Method(DWRITE_FONT_STYLE, "GetFontStyle", []),
+    #Method(DWRITE_FONT_STRETCH, "GetFontStretch", []),
+    #Method(FLOAT, "GetFontSize", []),
+    #Method(UINT32, "GetLocaleNameLength", []),
+    #Method(HRESULT, "GetLocaleName", [Out(Pointer(WCHAR), "localeName"), (UINT32, "nameSize")]),
 ]
 
 IDWriteTypography.methods += [