[ros-diffs] [reactos] 106/218: [WINESYNC] d3dx9: Fix argument type in convert_dib_to_bmp().

[winesync]

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

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

    [WINESYNC] d3dx9: Fix argument type in convert_dib_to_bmp().
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 8bed853c4380ebf86220ffe2fd89d48d98a90921 by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/surface.c | 6 +++---
 sdk/tools/winesync/d3dx9.cfg        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c
index 92564dfb5ce..aaaef34948f 100644
--- a/dll/directx/wine/d3dx9_36/surface.c
+++ b/dll/directx/wine/d3dx9_36/surface.c
@@ -774,7 +774,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9
*volume_texture, co
     return D3D_OK;
 }
 
-static BOOL convert_dib_to_bmp(void **data, UINT *size)
+static BOOL convert_dib_to_bmp(const void **data, unsigned int *size)
 {
     ULONG header_size;
     ULONG count = 0;
@@ -882,7 +882,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT
datasize,
     }
 
     /* In case of DIB file, convert it to BMP */
-    dib = convert_dib_to_bmp((void**)&data, &datasize);
+    dib = convert_dib_to_bmp(&data, &datasize);
 
     hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory);
 
@@ -1158,7 +1158,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9
*pDestSurface,
     }
 
     if (imginfo.ImageFileFormat == D3DXIFF_DIB)
-        convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize);
+        convert_dib_to_bmp(&pSrcData, &SrcDataSize);
 
     if (FAILED(WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory)))
         goto cleanup_err;
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 75c482ee88d..c4c1db7ed0f 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: 70d722340ad546ab988fffe4577e0c0ebe35a982}
+tags: {wine: 8bed853c4380ebf86220ffe2fd89d48d98a90921}