[ros-diffs] [reactos] 137/218: [WINESYNC] d3dx9: Return an error if no fallback format is found.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28df0e9ba85ad086232f9…

commit 28df0e9ba85ad086232f9197668f0162726b4f1d
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:01:48 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:04 2021 +0100

    [WINESYNC] d3dx9: Return an error if no fallback format is found.
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id fcdcd5d3cbb58a40894f661fd8a9285b81a55789 by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/texture.c | 5 +++++
 sdk/tools/winesync/d3dx9.cfg        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c
index bdba12d5a62..cdbf3712079 100644
--- a/dll/directx/wine/d3dx9_36/texture.c
+++ b/dll/directx/wine/d3dx9_36/texture.c
@@ -327,6 +327,11 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9
*device, UIN
                 bestfmt = curfmt;
             }
         }
+        if (!bestfmt)
+        {
+            hr = D3DERR_NOTAVAILABLE;
+            goto cleanup;
+        }
         fmt = bestfmt;
         hr = D3D_OK;
     }
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 8b675b5e764..095ac63f2c1 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: a0840773f7ee00dc9373b4db825fec68d08ee53b}
+tags: {wine: fcdcd5d3cbb58a40894f661fd8a9285b81a55789}