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

d3dxof: Allocate subobjects at object creation time.

This commit is contained in:
Christian Costa 2008-12-23 11:56:27 +01:00 committed by Alexandre Julliard
parent 4c68fdbf40
commit 23a3552d0d
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/d3dxof/d3dxof.c
View File

@ -2109,9 +2109,9 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional)
TRACE("Found optional reference %s\n", (char*)buf->value); TRACE("Found optional reference %s\n", (char*)buf->value);
for (i = 0; i < buf->nb_pxo_globals; i++) for (i = 0; i < buf->nb_pxo_globals; i++)
{ {
for (j = 0; j < buf->pxo_globals[i*MAX_SUBOBJECTS].nb_subobjects; j++) for (j = 0; j < (buf->pxo_globals[i])[0].nb_subobjects; j++)
{ {
if (!strcmp(buf->pxo_globals[i*MAX_SUBOBJECTS+j].name, (char*)buf->value)) if (!strcmp((buf->pxo_globals[i])[j].name, (char*)buf->value))
goto _exit; goto _exit;
} }
} }
@ -2122,7 +2122,7 @@ _exit:
return FALSE; return FALSE;
} }
buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++];
buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &buf->pxo_globals[i*MAX_SUBOBJECTS+j]; buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j];
buf->pxo->nb_childs++; buf->pxo->nb_childs++;
} }
else if (check_TOKEN(buf) == TOKEN_NAME) else if (check_TOKEN(buf) == TOKEN_NAME)
@ -2237,13 +2237,20 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
This->buf.pxo_globals = &This->xobjects[0][0]; This->buf.pxo_globals = This->xobjects;
This->buf.nb_pxo_globals = This->nb_xobjects; This->buf.nb_pxo_globals = This->nb_xobjects;
This->buf.pxo_tab = &This->xobjects[This->nb_xobjects][0]; This->buf.cur_subobject = 1;
This->buf.cur_subobject = 0;
This->buf.pxo = &This->buf.pxo_tab[This->buf.cur_subobject++];
This->buf.level = 0; This->buf.level = 0;
This->buf.pxo_tab = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS);
if (!This->buf.pxo_tab)
{
ERR("Out of memory\n");
hr = DXFILEERR_BADALLOC;
goto error;
}
This->buf.pxo = This->xobjects[This->nb_xobjects] = This->buf.pxo_tab;
pdata = HeapAlloc(GetProcessHeap(), 0, MAX_DATA_SIZE); pdata = HeapAlloc(GetProcessHeap(), 0, MAX_DATA_SIZE);
if (!pdata) if (!pdata)
{ {
@ -2291,6 +2298,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE
error: error:
HeapFree(GetProcessHeap(), 0, This->buf.pxo_tab);
HeapFree(GetProcessHeap(), 0, pdata); HeapFree(GetProcessHeap(), 0, pdata);
HeapFree(GetProcessHeap(), 0, pstrings); HeapFree(GetProcessHeap(), 0, pstrings);

4
dlls/d3dxof/d3dxof_private.h
View File

@ -130,7 +130,7 @@ typedef struct {
LPBYTE cur_pdata; LPBYTE cur_pdata;
LPBYTE cur_pstrings; LPBYTE cur_pstrings;
BYTE value[100]; BYTE value[100];
xobject* pxo_globals; xobject** pxo_globals;
ULONG nb_pxo_globals; ULONG nb_pxo_globals;
xobject* pxo_tab; xobject* pxo_tab;
IDirectXFileImpl* pdxf; IDirectXFileImpl* pdxf;
@ -149,7 +149,7 @@ typedef struct {
parse_buffer buf; parse_buffer buf;
IDirectXFileImpl* pDirectXFile; IDirectXFileImpl* pDirectXFile;
ULONG nb_xobjects; ULONG nb_xobjects;
xobject xobjects[MAX_OBJECTS][MAX_SUBOBJECTS]; xobject* xobjects[MAX_OBJECTS];
} IDirectXFileEnumObjectImpl; } IDirectXFileEnumObjectImpl;
typedef struct { typedef struct {