[3/4] dwrite: Implement IDWriteBitmapRenderTarget creation
Nikolay Sivov
nsivov at codeweavers.com
Sun Aug 5 15:26:43 CDT 2012
Implement IDWriteBitmapRenderTarget creation
-------------- next part --------------
>From 5e9bd490686fb95e182610d625243e3356ac21b4 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun, 5 Aug 2012 00:27:48 +0400
Subject: [PATCH 5/5] Implement IDWriteBitmapRenderTarget creation
---
dlls/dwrite/Makefile.in | 1 +
dlls/dwrite/gdiinterop.c | 168 ++++++++++++++++++++++++++++++++++++++++-
dlls/dwrite/tests/Makefile.in | 2 +-
dlls/dwrite/tests/font.c | 68 +++++++++++++++++
4 files changed, 236 insertions(+), 3 deletions(-)
diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in
index f4ee7ae..6da8c62 100644
--- a/dlls/dwrite/Makefile.in
+++ b/dlls/dwrite/Makefile.in
@@ -1,5 +1,6 @@
MODULE = dwrite.dll
IMPORTLIB = dwrite
+IMPORTS = gdi32
C_SRCS = \
font.c \
diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c
index d98eb5b..15d2431 100644
--- a/dlls/dwrite/gdiinterop.c
+++ b/dlls/dwrite/gdiinterop.c
@@ -18,10 +18,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#define COBJMACROS
+
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "dwrite.h"
#include "dwrite_private.h"
@@ -29,6 +32,167 @@
WINE_DEFAULT_DEBUG_CHANNEL(dwrite);
+struct rendertarget {
+ IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface;
+ LONG ref;
+
+ HDC hdc;
+};
+
+static inline struct rendertarget *impl_from_IDWriteBitmapRenderTarget(IDWriteBitmapRenderTarget *iface)
+{
+ return CONTAINING_RECORD(iface, struct rendertarget, IDWriteBitmapRenderTarget_iface);
+}
+
+static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget *iface, REFIID riid, void **obj)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+
+ TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj);
+
+ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteBitmapRenderTarget))
+ {
+ *obj = iface;
+ IDWriteBitmapRenderTarget_AddRef(iface);
+ return S_OK;
+ }
+
+ *obj = NULL;
+
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI rendertarget_AddRef(IDWriteBitmapRenderTarget *iface)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ ULONG ref = InterlockedIncrement(&This->ref);
+ TRACE("(%p)->(%d)\n", This, ref);
+ return ref;
+}
+
+static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget *iface)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ TRACE("(%p)->(%d)\n", This, ref);
+
+ if (!ref)
+ {
+ DeleteDC(This->hdc);
+ heap_free(This);
+ }
+
+ return S_OK;
+}
+
+static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget *iface,
+ FLOAT baselineOriginX, FLOAT baselineOriginY, DWRITE_MEASURING_MODE measuring_mode,
+ DWRITE_GLYPH_RUN const* glyph_run, IDWriteRenderingParams* params, COLORREF textColor,
+ RECT *blackbox_rect)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ FIXME("(%p)->(%f %f %d %p %p 0x%08x %p): stub\n", This, baselineOriginX, baselineOriginY,
+ measuring_mode, glyph_run, params, textColor, blackbox_rect);
+ return E_NOTIMPL;
+}
+
+static HDC WINAPI rendertarget_GetMemoryDC(IDWriteBitmapRenderTarget *iface)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ TRACE("(%p)\n", This);
+ return This->hdc;
+}
+
+static FLOAT WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget *iface)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ FIXME("(%p): stub\n", This);
+ return 1.0;
+}
+
+static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget *iface, FLOAT pixels_per_dip)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ FIXME("(%p)->(%f): stub\n", This, pixels_per_dip);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX *transform)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ FIXME("(%p)->(%p): stub\n", This, transform);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX const *transform)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ FIXME("(%p)->(%p): stub\n", This, transform);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget *iface, SIZE *size)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ FIXME("(%p)->(%p): stub\n", This, size);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget *iface, UINT32 width, UINT32 height)
+{
+ struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface);
+ FIXME("(%p)->(%u %u): stub\n", This, width, height);
+ return E_NOTIMPL;
+}
+
+static IDWriteBitmapRenderTargetVtbl rendertargetvtbl = {
+ rendertarget_QueryInterface,
+ rendertarget_AddRef,
+ rendertarget_Release,
+ rendertarget_DrawGlyphRun,
+ rendertarget_GetMemoryDC,
+ rendertarget_GetPixelsPerDip,
+ rendertarget_SetPixelsPerDip,
+ rendertarget_GetCurrentTransform,
+ rendertarget_SetCurrentTransform,
+ rendertarget_GetSize,
+ rendertarget_Resize
+};
+
+static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target)
+{
+ char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)];
+ BITMAPINFO *bmi = (BITMAPINFO*)bmibuf;
+ struct rendertarget *This;
+ HBITMAP dib;
+
+ *target = NULL;
+
+ This = heap_alloc(sizeof(struct rendertarget));
+ if (!This) return E_OUTOFMEMORY;
+
+ This->IDWriteBitmapRenderTarget_iface.lpVtbl = &rendertargetvtbl;
+ This->ref = 1;
+
+ This->hdc = CreateCompatibleDC(hdc);
+
+ memset(bmi, 0, sizeof(bmibuf));
+ bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader);
+ bmi->bmiHeader.biHeight = height;
+ bmi->bmiHeader.biWidth = width;
+ bmi->bmiHeader.biBitCount = 32;
+ bmi->bmiHeader.biPlanes = 1;
+ bmi->bmiHeader.biCompression = BI_RGB;
+
+ dib = CreateDIBSection(This->hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0);
+ SelectObject(This->hdc, dib);
+
+ *target = &This->IDWriteBitmapRenderTarget_iface;
+
+ return S_OK;
+}
+
static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop *iface, REFIID riid, void **obj)
{
TRACE("(%s %p)\n", debugstr_guid(riid), obj);
@@ -88,8 +252,8 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface,
static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface,
HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target)
{
- FIXME("(%p %u %u %p): stub\n", hdc, width, height, target);
- return E_NOTIMPL;
+ TRACE("(%p %u %u %p)\n", hdc, width, height, target);
+ return create_rendertarget(hdc, width, height, target);
}
static const struct IDWriteGdiInteropVtbl gdiinteropvtbl = {
diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in
index f00d0e7..98843cf 100644
--- a/dlls/dwrite/tests/Makefile.in
+++ b/dlls/dwrite/tests/Makefile.in
@@ -1,5 +1,5 @@
TESTDLL = dwrite.dll
-IMPORTS = dwrite
+IMPORTS = dwrite gdi32
C_SRCS = \
font.c
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 7e30eb0..511924a 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -151,6 +151,73 @@ todo_wine
IDWriteGdiInterop_Release(interop);
}
+static void test_CreateBitmapRenderTarget(void)
+{
+ IDWriteBitmapRenderTarget *target, *target2;
+ IDWriteGdiInterop *interop;
+ DIBSECTION ds;
+ HBITMAP hbm;
+ HRESULT hr;
+ HDC hdc;
+ int ret;
+
+ hr = IDWriteFactory_GetGdiInterop(factory, &interop);
+ EXPECT_HR(hr, S_OK);
+
+ target = NULL;
+ hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target);
+ EXPECT_HR(hr, S_OK);
+
+ target2 = NULL;
+ hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target2);
+ EXPECT_HR(hr, S_OK);
+ ok(target != target2, "got %p, %p\n", target2, target);
+ IDWriteBitmapRenderTarget_Release(target2);
+
+ hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target);
+ ok(hdc != NULL, "got %p\n", hdc);
+
+ hbm = GetCurrentObject(hdc, OBJ_BITMAP);
+ ok(hbm != NULL, "got %p\n", hbm);
+
+ /* check DIB properties */
+ ret = GetObjectW(hbm, sizeof(ds), &ds);
+ ok(ret == sizeof(BITMAP), "got %d\n", ret);
+ ok(ds.dsBm.bmWidth == 1, "got %d\n", ds.dsBm.bmWidth);
+ ok(ds.dsBm.bmHeight == 1, "got %d\n", ds.dsBm.bmHeight);
+ ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes);
+ ok(ds.dsBm.bmBitsPixel == 1, "got %d\n", ds.dsBm.bmBitsPixel);
+ ok(!ds.dsBm.bmBits, "got %p\n", ds.dsBm.bmBits);
+
+ IDWriteBitmapRenderTarget_Release(target);
+
+ hbm = GetCurrentObject(hdc, OBJ_BITMAP);
+ ok(!hbm, "got %p\n", hbm);
+
+ target = NULL;
+ hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 10, 5, &target);
+ EXPECT_HR(hr, S_OK);
+
+ hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target);
+ ok(hdc != NULL, "got %p\n", hdc);
+
+ hbm = GetCurrentObject(hdc, OBJ_BITMAP);
+ ok(hbm != NULL, "got %p\n", hbm);
+
+ /* check DIB properties */
+ ret = GetObjectW(hbm, sizeof(ds), &ds);
+ ok(ret == sizeof(ds), "got %d\n", ret);
+ ok(ds.dsBm.bmWidth == 10, "got %d\n", ds.dsBm.bmWidth);
+ ok(ds.dsBm.bmHeight == 5, "got %d\n", ds.dsBm.bmHeight);
+ ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes);
+ ok(ds.dsBm.bmBitsPixel == 32, "got %d\n", ds.dsBm.bmBitsPixel);
+ ok(ds.dsBm.bmBits != NULL, "got %p\n", ds.dsBm.bmBits);
+
+ IDWriteBitmapRenderTarget_Release(target);
+
+ IDWriteGdiInterop_Release(interop);
+}
+
START_TEST(font)
{
HRESULT hr;
@@ -164,6 +231,7 @@ START_TEST(font)
}
test_CreateFontFromLOGFONT();
+ test_CreateBitmapRenderTarget();
IDWriteFactory_Release(factory);
}
--
1.5.6.5
More information about the wine-patches
mailing list