Re: [1/3] WineD3D: Fix a problem in BltOverride

[Alexander Dorofeyev]

Hi.

I think it may be the same regression I also saw in another app. At least it
seems to be in that place too. Can you check if this patch helps?

Maxime Bellengé wrote:
    > Hi Stephan,
    >
    > Since this patch has been commited to git I have a big regression in the
    > game Syberia. Everything is black. Nothing is displayed expected some
    > menu items.
    >
    > In order to determine that this is this patch which is the problem I did
    > a "git bisect".
    >
    > Maxime








diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 24cc14d..f3197ab 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2971,10 +2971,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
     } else if(dstSwapchain && srcSwapchain) {
         FIXME("Implement hardware blit between two different swapchains\n");
         return WINED3DERR_INVALIDCALL;
-    } else if(dstSwapchain) {
+    } else if(dstSwapchain && SrcSurface) {
         if(SrcSurface != myDevice->render_targets[0]) {
             ERR("Unexpected render target -> render target blit\n");
-            return 0;
+            return WINED3DERR_INVALIDCALL;
         }
         TRACE("Blit from active render target to a swapchain\n");
         /* Handled with regular texture -> swapchain blit */