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

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

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

36
dlls/d3drm/frame.c
View File

@ -197,15 +197,31 @@ static const struct IDirect3DRMFrameArrayVtbl d3drm_frame_array_vtbl =
d3drm_frame_array_GetElement,
};
static struct d3drm_frame_array *d3drm_frame_array_create(void)
static struct d3drm_frame_array *d3drm_frame_array_create(unsigned int frame_count, IDirect3DRMFrame3 **frames)
{
struct d3drm_frame_array *array;
unsigned int i;
if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array))))
return NULL;
array->IDirect3DRMFrameArray_iface.lpVtbl = &d3drm_frame_array_vtbl;
array->ref = 1;
array->size = frame_count;
if (frame_count)
{
if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, frame_count * sizeof(*array->frames))))
{
HeapFree(GetProcessHeap(), 0, array);
return NULL;
}
for (i = 0; i < frame_count; ++i)
{
IDirect3DRMFrame3_QueryInterface(frames[i], &IID_IDirect3DRMFrame, (void **)&array->frames[i]);
}
}
return array;
}
@ -1500,25 +1516,9 @@ static HRESULT WINAPI d3drm_frame3_GetChildren(IDirect3DRMFrame3 *iface, IDirect
if (!children)
return D3DRMERR_BADVALUE;
if (!(array = d3drm_frame_array_create()))
if (!(array = d3drm_frame_array_create(frame->nb_children, frame->children)))
return E_OUTOFMEMORY;
array->size = frame->nb_children;
if (frame->nb_children)
{
ULONG i;
if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, frame->nb_children * sizeof(*array->frames))))
{
HeapFree(GetProcessHeap(), 0, array);
return E_OUTOFMEMORY;
}
for (i = 0; i < frame->nb_children; ++i)
{
IDirect3DRMFrame3_QueryInterface(frame->children[i], &IID_IDirect3DRMFrame, (void **)&array->frames[i]);
}
}
*children = &array->IDirect3DRMFrameArray_iface;
return D3DRM_OK;