From: José Fonseca Date: Mon, 10 Oct 2011 08:41:49 +0000 (+0100) Subject: Get d2d to build on MinGW. X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=f1c534ee5e0740ebc8f72334ae325d5d1f06c048;p=apitrace Get d2d to build on MinGW. --- diff --git a/compat.h b/compat.h index c7fb3d5..4573b97 100644 --- 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 + #define INT8 int8_t #define UINT8 uint8_t #define INT16 int16_t diff --git a/specs/dwrite.py b/specs/dwrite.py index f7d284b..38fbe21 100644 --- 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 += [