[ros-diffs] [akhaldi] 66420: [D3DRM] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Mon Feb 23 11:03:25 2015
New Revision: 66420

URL: http://svn.reactos.org/svn/reactos?rev=66420&view=rev
Log:
[D3DRM] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/directx/wine/d3drm/d3drm.c
    trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/d3drm/d3drm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3drm/d3drm.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3drm/d3drm.c	[iso-8859-1] Mon Feb 23 11:03:25 2015
@@ -1229,17 +1229,16 @@
         /* 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;
         }

Modified: trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/mes…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c	[iso-8859-1] Mon Feb 23 11:03:25
2015
@@ -1065,7 +1065,6 @@
     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);
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Feb 23 11:03:25 2015
@@ -31,7 +31,7 @@
 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