[ros-diffs] [reactos] 118/218: [WINESYNC] d3dx9: Relax a block alignment check.

[winesync]

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

commit eaf1129b76073d0081d64309414851f509d58e58
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: Relax a block alignment check.
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id e371085aaf4424e6ef9b5b76ebf3107121d22f50 by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/surface.c | 6 +-----
 sdk/tools/winesync/d3dx9.cfg        | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c
index 2809cc71eb1..245f902b181 100644
--- a/dll/directx/wine/d3dx9_36/surface.c
+++ b/dll/directx/wine/d3dx9_36/surface.c
@@ -1909,11 +1909,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9
*dst_surface,
             && color_key == 0) /* Simple copy. */
     {
         if (src_rect->left & (srcformatdesc->block_width - 1)
-                || src_rect->top & (srcformatdesc->block_height - 1)
-                || (src_rect->right & (srcformatdesc->block_width - 1)
-                    && src_size.width != surfdesc.Width)
-                || (src_rect->bottom & (srcformatdesc->block_height - 1)
-                    && src_size.height != surfdesc.Height))
+                || src_rect->top & (srcformatdesc->block_height - 1))
         {
             WARN("Source rect %s is misaligned.\n",
wine_dbgstr_rect(src_rect));
             unlock_surface(dst_surface, dst_rect, surface, FALSE);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 54dfc067b78..9119a897fda 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: b744a309ace15a8c5494cf7134294c5869d2dade}
+tags: {wine: e371085aaf4424e6ef9b5b76ebf3107121d22f50}