Henri Verbeet : d2d1: Implement d2d_bitmap_GetPixelSize().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b270384dfb213b058cce72395d93909afe058c34
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b270384dfb213b058cce72395d...

Author: Henri Verbeet 
Date:   Fri Feb  6 09:56:58 2015 +0100

d2d1: Implement d2d_bitmap_GetPixelSize().

---

dlls/d2d1/bitmap.c       | 9 ++++++---
 dlls/d2d1/d2d1_private.h | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index 43c4881..b3ba570 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -88,10 +88,11 @@ static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2

static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *iface, D2D1_SIZE_U *pixel_size)
 {
-    FIXME("iface %p, pixel_size %p stub!\n", iface, pixel_size);
+    struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
+
+    TRACE("iface %p, pixel_size %p.\n", iface, pixel_size);

-    pixel_size->width = 0;
-    pixel_size->height = 0;
+    *pixel_size = bitmap->pixel_size;
     return pixel_size;
 }

@@ -158,4 +159,6 @@ void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *sr

bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl;
     bitmap->refcount = 1;
+
+    bitmap->pixel_size = size;
 }
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index e3cb98a..039612b 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -152,6 +152,8 @@ struct d2d_bitmap
 {
     ID2D1Bitmap ID2D1Bitmap_iface;
     LONG refcount;
+
+    D2D1_SIZE_U pixel_size;
 };

void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data,