Henri Verbeet : d2d1: Don' t pass NULL resource data to ID3D10Device_CreateTexture2D().
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jul 30 17:10:04 CDT 2015
Module: wine
Branch: master
Commit: e5c793e637784ac017f99b25bd4a53a98ea95116
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c793e637784ac017f99b25bd4a53a98ea95116
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Jul 30 11:10:58 2015 +0200
d2d1: Don't pass NULL resource data to ID3D10Device_CreateTexture2D().
---
dlls/d2d1/bitmap.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index 080663c..00359cb 100644
--- 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;
More information about the wine-cvs
mailing list