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

d3drm: Initialize the actual array in d3drm_light_array_create() as well.

This commit is contained in:
Henri Verbeet 2013-10-28 11:46:41 +01:00 committed by Alexandre Julliard
parent c0d05d9f4f
commit 7dc0738911
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/d3drm/frame.c
View File

@ -434,15 +434,32 @@ static const struct IDirect3DRMLightArrayVtbl d3drm_light_array_vtbl =
d3drm_light_array_GetElement, d3drm_light_array_GetElement,
}; };
static struct d3drm_light_array *d3drm_light_array_create(void) static struct d3drm_light_array *d3drm_light_array_create(unsigned int light_count, IDirect3DRMLight **lights)
{ {
struct d3drm_light_array *array; struct d3drm_light_array *array;
unsigned int i;
if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array))))
return NULL; return NULL;
array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl; array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl;
array->ref = 1; array->ref = 1;
array->size = light_count;
if (light_count)
{
if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, light_count * sizeof(*array->lights))))
{
HeapFree(GetProcessHeap(), 0, array);
return NULL;
}
for (i = 0; i < light_count; ++i)
{
array->lights[i] = lights[i];
IDirect3DRMLight_AddRef(array->lights[i]);
}
}
return array; return array;
} }
@ -1541,25 +1558,9 @@ static HRESULT WINAPI d3drm_frame3_GetLights(IDirect3DRMFrame3 *iface, IDirect3D
if (!lights) if (!lights)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
if (!(array = d3drm_light_array_create())) if (!(array = d3drm_light_array_create(frame->nb_lights, frame->lights)))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
array->size = frame->nb_lights;
if (frame->nb_lights)
{
ULONG i;
if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, frame->nb_lights * sizeof(*array->lights))))
{
HeapFree(GetProcessHeap(), 0, array);
return E_OUTOFMEMORY;
}
for (i = 0; i < frame->nb_lights; ++i)
{
IDirect3DRMLight_QueryInterface(frame->lights[i], &IID_IDirect3DRMLight, (void **)&array->lights[i]);
}
}
*lights = &array->IDirect3DRMLightArray_iface; *lights = &array->IDirect3DRMLightArray_iface;
return D3DRM_OK; return D3DRM_OK;