-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
subj is attached
Adds a ID2D1ImageVtbl (which only contains its base - ID2D1ResourceVtbl)
and an interface ID2D1Image based on that vtbl.
- --
O< ascii ribbon - stop html email! - www.asciiribbon.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (MingW32)
iQEcBAEBAgAGBQJSLHGeAAoJEOs4Jb6SI2Cwf5YH/RXPoOQR1LVF/E3aTqOjN2kH
EShydLu1Ly3cvj72aivFCtZmzUfuy+oqQU6LcBQWg8WAPTCNB2xyofs6eAWGFZWx
GPXLTFwCRh1mWESfKhBiPgiQFecAeErZRphjzONtPksa8aXNTYzGGQqDGRKAWCWD
FncRY/F9yYrZK9/1YXUmPnwcaaKckhITP37+oKxqfNYU8bcHcZD8sy2LJPuyjmGb
X2uxSWlZqZcdABRd4bZAKHja7lRNDd/M9UxaJ+CtUDnlVSPV5L8LJ/mK3cZ0HG+F
1G1UYD+8+3M2AGtmnL90qJJaC9KuH8y+/n6PyeI7u2iwMD+r2k5M8GsnaujHdPA=
=YCe4
-----END PGP SIGNATURE-----
From bf5eef99ba1c88afc79364bdb5870a48bbeb6b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <[email protected]>
Date: Fri, 23 Aug 2013 16:25:34 +0000
Subject: [PATCH 1/2] Declare ID2D1Image correctly
---
mingw-w64-headers/include/d2d1.h | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/mingw-w64-headers/include/d2d1.h b/mingw-w64-headers/include/d2d1.h
index 2bc29c3..75a313e 100644
--- a/mingw-w64-headers/include/d2d1.h
+++ b/mingw-w64-headers/include/d2d1.h
@@ -644,8 +644,18 @@ interface ID2D1Image : public ID2D1Resource {};
#else
-typedef interface ID2D1Image ID2D1Image;
-/* FIXME: Add full C declaration */
+typedef struct ID2D1ImageVtbl {
+ ID2D1ResourceVtbl Base;
+} ID2D1ImageVtbl;
+
+interface ID2D1Image {
+ const ID2D1ImageVtbl *lpVtbl;
+};
+
+#define ID2D1Image_QueryInterface(this,A,B)
(this)->lpVtbl->Base.Base.QueryInterface((IUnkwnown*)this,A,B)
+#define ID2D1Image_AddRef(this)
(this)->lpVtbl->Base.Base.AddRef((IUnknown*)this)
+#define ID2D1Image_Release(this)
(this)->lpVtbl->Base.Base.Release((IUnknown*)this)
+#define ID2D1Image_GetFactory(this,A)
(this)->lpVtbl->Base.GetFactory((ID2D1Resource*)this,A)
#endif
@@ -681,10 +691,10 @@ interface ID2D1Bitmap {
const ID2D1BitmapVtbl *lpVtbl;
};
-#define ID2D1Bitmap_QueryInterface(this,A,B)
(this)->lpVtbl->Base.Base.QueryInterface((IUnkwnown*)this,A,B)
-#define ID2D1Bitmap_AddRef(this)
(this)->lpVtbl->Base.Base.AddRef((IUnknown*)this)
-#define ID2D1Bitmap_Release(this)
(this)->lpVtbl->Base.Base.Release((IUnknown*)this)
-#define ID2D1Bitmap_GetFactory(this,A)
(this)->lpVtbl->Base.GetFactory((ID2D1Resource*)this,A)
+#define ID2D1Bitmap_QueryInterface(this,A,B)
(this)->lpVtbl->Base.Base.Base.QueryInterface((IUnkwnown*)this,A,B)
+#define ID2D1Bitmap_AddRef(this)
(this)->lpVtbl->Base.Base.Base.AddRef((IUnknown*)this)
+#define ID2D1Bitmap_Release(this)
(this)->lpVtbl->Base.Base.Base.Release((IUnknown*)this)
+#define ID2D1Bitmap_GetFactory(this,A)
(this)->lpVtbl->Base.Base.GetFactory((ID2D1Resource*)this,A)
#define ID2D1Bitmap_GetSize(this) (this)->lpVtbl->GetSize(this)
#define ID2D1Bitmap_GetPixelSize(this) (this)->lpVtbl->GetPixelSize(this)
#define ID2D1Bitmap_GetPixelFormat(this) (this)->lpVtbl->GetPixelFormat(this)
--
1.8.4
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
