mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 21:43:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/trunk/; revision=66420
This commit is contained in:
Amine Khaldi 2015-02-23 11:03:25 +00:00
parent 765910a9dd
commit b3871ae66b
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
reactos/dll/directx/wine/d3drm/d3drm.c
View File

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

1
reactos/dll/directx/wine/d3drm/meshbuilder.c
View File

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

2
reactos/media/doc/README.WINE
View File

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