[ros-diffs] [reactos] 100/218: [WINESYNC] include: Fix D3DXF_FILELOADMEMORY definition.

[winesync]

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

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

    [WINESYNC] include: Fix D3DXF_FILELOADMEMORY definition.
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id c9c74b8b10116c3f0b3bd4d08724963245499a92 by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/xfile.c | 2 +-
 sdk/include/dxsdk/d3dx9xof.h      | 2 +-
 sdk/tools/winesync/d3dx9.cfg      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/xfile.c b/dll/directx/wine/d3dx9_36/xfile.c
index fc44c7f391e..f75433bb4b0 100644
--- a/dll/directx/wine/d3dx9_36/xfile.c
+++ b/dll/directx/wine/d3dx9_36/xfile.c
@@ -592,7 +592,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/sdk/include/dxsdk/d3dx9xof.h b/sdk/include/dxsdk/d3dx9xof.h
index 35019f26d4e..227f3a57ba2 100644
--- a/sdk/include/dxsdk/d3dx9xof.h
+++ b/sdk/include/dxsdk/d3dx9xof.h
@@ -49,7 +49,7 @@ typedef struct _D3DXF_FILELOADRESOURCE
 
 typedef struct _D3DXF_FILELOADMEMORY
 {
-    void *lpMemory;
+    const void *lpMemory;
     SIZE_T dSize;
 } D3DXF_FILELOADMEMORY;
 
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 616db55328b..f2f9fecdde7 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: cd3e5020e4c87f49eb042fff9f607b6d745a5d55}
+tags: {wine: c9c74b8b10116c3f0b3bd4d08724963245499a92}