d2d1: Don't pass NULL resource data to ID3D10Device_CreateTexture2D().

e5c793e6 · Henri Verbeet · Alexandre Julliard · 4371946d · e5c793e6
Commit e5c793e6 authored Jul 30, 2015 by Henri Verbeet Committed by Alexandre Julliard Jul 30, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

bitmap.c dlls/d2d1/bitmap.c +2 -1

No files found.
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -228,7 +228,8 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target 
    resource_data.pSysMem = src_data;
    resource_data.SysMemPitch = pitch;

-    if (FAILED(hr = ID3D10Device_CreateTexture2D(render_target->device, &texture_desc, &resource_data, &texture)))
+    if (FAILED(hr = ID3D10Device_CreateTexture2D(render_target->device, &texture_desc,
+            src_data ? &resource_data : NULL, &texture)))
    {
        ERR("Failed to create texture, hr %#x.\n", hr);
        return hr;