[ros-diffs] [reactos] 117/218: [WINESYNC] d3dx9: Simplify unsupported format check.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74df1d450bced87485896…

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

    [WINESYNC] d3dx9: Simplify unsupported format check.
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id b744a309ace15a8c5494cf7134294c5869d2dade by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/surface.c | 4 ++--
 sdk/tools/winesync/d3dx9.cfg        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c
index 5d775c1617b..2809cc71eb1 100644
--- a/dll/directx/wine/d3dx9_36/surface.c
+++ b/dll/directx/wine/d3dx9_36/surface.c
@@ -1894,9 +1894,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9
*dst_surface,
 
     srcformatdesc = get_format_info(src_format);
     destformatdesc = get_format_info(surfdesc.Format);
-    if (srcformatdesc->type == FORMAT_UNKNOWN || destformatdesc->type ==
FORMAT_UNKNOWN)
+    if (srcformatdesc->type == FORMAT_UNKNOWN)
     {
-        FIXME("Unsupported pixel format conversion %#x -> %#x\n",
src_format, surfdesc.Format);
+        FIXME("Unsupported format %#x.\n", src_format);
         return E_NOTIMPL;
     }
 
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index e3c8931ca37..54dfc067b78 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: 92c00c51b21594987d342b5ce00c174ab4e84595}
+tags: {wine: b744a309ace15a8c5494cf7134294c5869d2dade}