ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3drm: Fix some tests conditions.

This commit is contained in:
Christian Costa 2012-03-14 09:06:19 +01:00 committed by Alexandre Julliard
parent 23c6fddea3
commit 0233344799
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3drm/meshbuilder.c
View File

@ -1163,7 +1163,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3*
TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid));
if (!IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) if (IsEqualGUID(pGuid, &TID_D3DRMMeshNormals))
{ {
DWORD tmp; DWORD tmp;
@ -1179,7 +1179,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3*
This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR)); This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR));
memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR)); memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR));
} }
else if(!IsEqualGUID(pGuid, &TID_D3DRMMeshTextureCoords)) else if (IsEqualGUID(pGuid, &TID_D3DRMMeshTextureCoords))
{ {
hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr);
if (hr != DXFILE_OK) if (hr != DXFILE_OK)
@ -1193,7 +1193,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3*
memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d)); memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d));
} }
else if(!IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) else if (IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList))
{ {
FIXME("MeshMaterialList not supported yet, ignoring...\n"); FIXME("MeshMaterialList not supported yet, ignoring...\n");
} }