Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Fix argument type in convert_dib_to_bmp().

Browse source 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 8bed853c4380ebf86220ffe2fd89d48d98a90921 by Matteo Bruni <mbruni@codeweavers.com>
This commit is contained in:
winesync 2020-09-21 22:50:20 +02:00 committed by Jérôme Gardou
parent e6deaabfc6
commit 7fb747193a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dll/directx/wine/d3dx9_36/surface.c
View file

@ -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;

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -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}