Paul Gofman : d3dx9: Do not ignore surface map failure in D3DXSaveSurfaceToFileInMemory().
Alexandre Julliard
julliard at winehq.org
Mon Nov 25 09:12:21 CST 2019
Module: wine
Branch: stable
Commit: 056e17135248f62b2def61a0b2ec479defab0dba
URL: https://source.winehq.org/git/wine.git/?a=commit;h=056e17135248f62b2def61a0b2ec479defab0dba
Author: Paul Gofman <gofmanp at gmail.com>
Date: Mon Jan 14 21:45:11 2019 +0100
d3dx9: Do not ignore surface map failure in D3DXSaveSurfaceToFileInMemory().
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit ce090114340fe6ce9314f543a1389de9bdc6df14)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/d3dx9_36/surface.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index a6eb5482f7..faac141951 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -2229,12 +2229,12 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
if (src_surface_desc.Format == d3d_pixel_format) /* Simple copy */
{
hr = IDirect3DSurface9_LockRect(src_surface, &locked_rect, src_rect, D3DLOCK_READONLY);
- if (SUCCEEDED(hr))
- {
- IWICBitmapFrameEncode_WritePixels(frame, height,
- locked_rect.Pitch, height * locked_rect.Pitch, locked_rect.pBits);
- IDirect3DSurface9_UnlockRect(src_surface);
- }
+ if (FAILED(hr))
+ goto cleanup;
+
+ IWICBitmapFrameEncode_WritePixels(frame, height,
+ locked_rect.Pitch, height * locked_rect.Pitch, locked_rect.pBits);
+ IDirect3DSurface9_UnlockRect(src_surface);
}
else /* Pixel format conversion */
{
@@ -2266,12 +2266,14 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
}
hr = IDirect3DSurface9_LockRect(src_surface, &locked_rect, src_rect, D3DLOCK_READONLY);
- if (SUCCEEDED(hr))
+ if (FAILED(hr))
{
- convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &size, src_format_desc,
- dst_data, dst_pitch, 0, &size, dst_format_desc, 0, NULL);
- IDirect3DSurface9_UnlockRect(src_surface);
+ HeapFree(GetProcessHeap(), 0, dst_data);
+ goto cleanup;
}
+ convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &size, src_format_desc,
+ dst_data, dst_pitch, 0, &size, dst_format_desc, 0, NULL);
+ IDirect3DSurface9_UnlockRect(src_surface);
IWICBitmapFrameEncode_WritePixels(frame, height, dst_pitch, dst_pitch * height, dst_data);
HeapFree(GetProcessHeap(), 0, dst_data);
More information about the wine-cvs
mailing list