Module: wine Branch: master Commit: c9c74b8b10116c3f0b3bd4d08724963245499a92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9c74b8b10116c3f0b3bd4d08...
Author: Matteo Bruni mbruni@codeweavers.com Date: Tue Mar 26 22:26:48 2019 +0100
include: Fix D3DXF_FILELOADMEMORY definition.
Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx9_36/xfile.c | 2 +- include/d3dx9xof.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 1575454..649ea96 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -588,7 +588,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * { D3DXF_FILELOADMEMORY *memory = (D3DXF_FILELOADMEMORY*)source;
- dxfile_memory.lpMemory = memory->lpMemory; + dxfile_memory.lpMemory = (void *)memory->lpMemory; dxfile_memory.dSize = memory->dSize; dxfile_source = &dxfile_memory; dxfile_options = DXFILELOAD_FROMMEMORY; diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 35019f2..227f3a5 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -49,7 +49,7 @@ typedef struct _D3DXF_FILELOADRESOURCE
typedef struct _D3DXF_FILELOADMEMORY { - void *lpMemory; + const void *lpMemory; SIZE_T dSize; } D3DXF_FILELOADMEMORY;