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

d3dxof: Enumerate only 2 levels of objects obtained from a reference.

This commit is contained in:
Christian Costa 2008-10-07 22:52:55 +02:00 committed by Alexandre Julliard
parent b12be1ce78
commit ded68e8a4f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/d3dxof/d3dxof.c
View File

@ -1409,6 +1409,12 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface
if (This->cur_enum_object >= This->pobj->nb_childs) if (This->cur_enum_object >= This->pobj->nb_childs)
return DXFILEERR_NOMOREOBJECTS; return DXFILEERR_NOMOREOBJECTS;
if (This->from_ref && (This->level >= 1))
{
/* Only 2 levels can enumerated if the object is obtained from a reference */
return DXFILEERR_NOMOREOBJECTS;
}
if (This->pobj->childs[This->cur_enum_object]->ptarget) if (This->pobj->childs[This->cur_enum_object]->ptarget)
{ {
IDirectXFileDataReferenceImpl *object; IDirectXFileDataReferenceImpl *object;
@ -1431,6 +1437,8 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface
object->pobj = This->pobj->childs[This->cur_enum_object++]; object->pobj = This->pobj->childs[This->cur_enum_object++];
object->cur_enum_object = 0; object->cur_enum_object = 0;
object->from_ref = This->from_ref;
object->level = This->level + 1;
*ppChildObj = (LPDIRECTXFILEOBJECT)object; *ppChildObj = (LPDIRECTXFILEOBJECT)object;
} }
@ -1590,6 +1598,8 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe
object->pobj = This->ptarget; object->pobj = This->ptarget;
object->cur_enum_object = 0; object->cur_enum_object = 0;
object->level = 0;
object->from_ref = TRUE;
*ppDataObj = (LPDIRECTXFILEDATA)object; *ppDataObj = (LPDIRECTXFILEDATA)object;
@ -1981,6 +1991,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
object->pobj = This->buf.pxo; object->pobj = This->buf.pxo;
object->cur_enum_object = 0; object->cur_enum_object = 0;
object->level = 0;
object->from_ref = FALSE;
*ppDataObj = (LPDIRECTXFILEDATA)object; *ppDataObj = (LPDIRECTXFILEDATA)object;

2
dlls/d3dxof/d3dxof_private.h
View File

@ -98,6 +98,8 @@ typedef struct {
LONG ref; LONG ref;
xobject* pobj; xobject* pobj;
int cur_enum_object; int cur_enum_object;
BOOL from_ref;
ULONG level;
} IDirectXFileDataImpl; } IDirectXFileDataImpl;
typedef struct { typedef struct {