[D3DRM] Sync with Wine Staging 1.7.37. CORE-9246

svn path=/trunk/; revision=66420

diff --git a/reactos/dll/directx/wine/d3drm/d3drm.c b/reactos/dll/directx/wine/d3drm/d3drm.c
index b1d2e69..79e601a 100644 (file)
--- a/reactos/dll/directx/wine/d3drm/d3drm.c
+++ b/reactos/dll/directx/wine/d3drm/d3drm.c
@@ -1229,17 +1229,16 @@ static HRESULT load_data(IDirect3DRM3 *iface, IDirectXFileData *data_object, IID
         /* Cannot be requested */
         if (parent_frame)
         {
-            D3DRMMATRIX4D matrix;
+            D3DRMMATRIX4D *matrix;
             DWORD size;
 
             TRACE("Load Frame Transform Matrix data\n");
 
-            size = sizeof(matrix);
-            hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)matrix);
+            hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)&matrix);
             if ((hr != DXFILE_OK) || (size != sizeof(matrix)))
                 goto end;
 
-            hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, matrix);
+            hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, *matrix);
             if (FAILED(hr))
                 goto end;
         }

diff --git a/reactos/dll/directx/wine/d3drm/meshbuilder.c b/reactos/dll/directx/wine/d3drm/meshbuilder.c
index 7f5ae7f..c65d59d 100644 (file)
--- a/reactos/dll/directx/wine/d3drm/meshbuilder.c
+++ b/reactos/dll/directx/wine/d3drm/meshbuilder.c
@@ -1065,7 +1065,6 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData,
     This->nb_vertices = *(DWORD*)ptr;
     This->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR));
     faces_vertex_idx_size = size - sizeof(DWORD) - This->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD);
-    faces_vertex_idx_ptr = (DWORD*)(ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD));
 
     TRACE("Mesh: nb_vertices = %d, nb_faces = %d, faces_vertex_idx_size = %d\n", This->nb_vertices, This->nb_faces, faces_vertex_idx_size);
 

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 930ac2a..510dced 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -31,7 +31,7 @@ reactos/dll/directx/wine/amstream       # Synced to Wine-1.7.27
 reactos/dll/directx/wine/d3d8           # Synced to Wine-1.7.27
 reactos/dll/directx/wine/d3d9           # Synced to Wine-1.7.27
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.37
-reactos/dll/directx/wine/d3drm          # Synced to Wine-1.7.27
+reactos/dll/directx/wine/d3drm          # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.27
 reactos/dll/directx/wine/d3dxof         # Synced to Wine-1.7.27
 reactos/dll/directx/wine/ddraw          # Synced to Wine-1.7.27