[PATCH 1/2] wined3d: Zero-initialize the swapchain context array.

[Matteo Bruni]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47255
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
Fixes a regression from commit db201072655946662c041a66ee434c30c245e5b0.

 dlls/wined3d/swapchain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index fbedd7470df..48d0920554d 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -892,7 +892,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3
 
     if (!(device->wined3d->flags & WINED3D_NO3D))
     {
-        if (!(swapchain->context = heap_alloc(sizeof(*swapchain->context))))
+        if (!(swapchain->context = heap_alloc_zero(sizeof(*swapchain->context))))
         {
             ERR("Failed to create the context array.\n");
             hr = E_OUTOFMEMORY;
-- 
2.21.0

[PATCH 2/2] d3dx9: Print a FIXME when D3DXSaveSurfaceToFileInMemory() is called with an empty rect.

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
 dlls/d3dx9_36/surface.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 57d9818cd91..531aeeb90d9 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -2129,7 +2129,8 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
     {
         if (src_rect->left == src_rect->right || src_rect->top == src_rect->bottom)
         {
-            WARN("Invalid rectangle with 0 area\n");
+            FIXME("Empty rectangle.\n");
+            /* This should return a proper file header. */
             return D3DXCreateBuffer(64, dst_buffer);
         }
         if (src_rect->left < 0 || src_rect->top < 0)
-- 
2.21.0

[Henri Verbeet]

On Fri, 31 May 2019 at 13:38, Matteo Bruni <mbruni(a)codeweavers.com> wrote:
> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47255
> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
> ---
> Fixes a regression from commit db201072655946662c041a66ee434c30c245e5b0.

I've sent a slightly different patch, that hopefully also addresses the issue.