Module: wine Branch: master Commit: 8ca8267caba2d31149d89286515ed66c301d0853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca8267caba2d31149d8928651...
Author: Francois Gouget fgouget@free.fr Date: Wed Aug 3 11:39:17 2011 +0200
d3dxof: Fix the spelling of the children structure fields and constants.
---
dlls/d3dxof/d3dxof.c | 10 +++++----- dlls/d3dxof/d3dxof_private.h | 10 +++++----- dlls/d3dxof/parsing.c | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b353020..b8f0f00 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -615,7 +615,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface
TRACE("(%p/%p)->(%p)\n", This, iface, ppChildObj);
- if (This->cur_enum_object >= This->pobj->nb_childs) + if (This->cur_enum_object >= This->pobj->nb_children) return DXFILEERR_NOMOREOBJECTS;
if (This->from_ref && (This->level >= 1)) @@ -624,7 +624,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface return DXFILEERR_NOMOREOBJECTS; }
- if (This->pobj->childs[This->cur_enum_object]->binary) + if (This->pobj->children[This->cur_enum_object]->binary) { IDirectXFileBinaryImpl *object;
@@ -634,7 +634,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface
*ppChildObj = (LPDIRECTXFILEOBJECT)&object->IDirectXFileBinary_iface; } - else if (This->pobj->childs[This->cur_enum_object]->ptarget) + else if (This->pobj->children[This->cur_enum_object]->ptarget) { IDirectXFileDataReferenceImpl *object;
@@ -642,7 +642,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface if (FAILED(hr)) return hr;
- object->ptarget = This->pobj->childs[This->cur_enum_object++]->ptarget; + object->ptarget = This->pobj->children[This->cur_enum_object++]->ptarget;
*ppChildObj = (LPDIRECTXFILEOBJECT)&object->IDirectXFileDataReference_iface; } @@ -654,7 +654,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface if (FAILED(hr)) return hr;
- object->pobj = This->pobj->childs[This->cur_enum_object++]; + object->pobj = This->pobj->children[This->cur_enum_object++]; object->cur_enum_object = 0; object->from_ref = This->from_ref; object->level = This->level + 1; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 186e707..ac9bb8b 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -36,7 +36,7 @@ #define MAX_NAME_LEN 32 #define MAX_ARRAY_DIM 4 #define MAX_MEMBERS 50 -#define MAX_CHILDS 100 +#define MAX_CHILDREN 100 #define MAX_TEMPLATES 200 #define MAX_OBJECTS 500 #define MAX_SUBOBJECTS 2000 @@ -56,8 +56,8 @@ typedef struct { GUID class_id; BOOL open; BOOL binary; - ULONG nb_childs; - char childs[MAX_CHILDS][MAX_NAME_LEN]; + ULONG nb_children; + char children[MAX_CHILDREN][MAX_NAME_LEN]; ULONG nb_members; member members[MAX_MEMBERS]; } xtemplate; @@ -79,9 +79,9 @@ struct _xobject { DWORD size; ULONG nb_members; xobject_member members[MAX_MEMBERS]; - ULONG nb_childs; + ULONG nb_children; ULONG nb_subobjects; - struct _xobject * childs[MAX_CHILDS]; + struct _xobject * children[MAX_CHILDREN]; struct _xobject * root; };
diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 1167456..21a199a 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -156,11 +156,11 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) } if (ptemplate->open) DPRINTF("[...]\n"); - else if (ptemplate->nb_childs) + else if (ptemplate->nb_children) { - DPRINTF("[%s", ptemplate->childs[0]); - for (j = 1; j < ptemplate->nb_childs; j++) - DPRINTF(",%s", ptemplate->childs[j]); + DPRINTF("[%s", ptemplate->children[0]); + for (j = 1; j < ptemplate->nb_children; j++) + DPRINTF(",%s", ptemplate->children[j]); DPRINTF("]\n"); } DPRINTF("}\n"); @@ -909,10 +909,10 @@ static BOOL parse_template_option_info(parse_buffer * buf) { if (get_TOKEN(buf) != TOKEN_NAME) return FALSE; - strcpy(cur_template->childs[cur_template->nb_childs], (char*)buf->value); + strcpy(cur_template->children[cur_template->nb_children], (char*)buf->value); if (check_TOKEN(buf) == TOKEN_GUID) get_TOKEN(buf); - cur_template->nb_childs++; + cur_template->nb_children++; if (check_TOKEN(buf) != TOKEN_COMMA) break; get_TOKEN(buf); @@ -1305,7 +1305,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { - buf->pxo->nb_childs = 0; + buf->pxo->nb_children = 0;
if (!parse_object_members_list(buf)) return FALSE; @@ -1350,10 +1350,10 @@ _exit: return FALSE; }
- buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; - buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j]; - buf->pxo->childs[buf->pxo->nb_childs]->binary = FALSE; - buf->pxo->nb_childs++; + buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; + buf->pxo->children[buf->pxo->nb_children]->ptarget = &(buf->pxo_globals[i])[j]; + buf->pxo->children[buf->pxo->nb_children]->binary = FALSE; + buf->pxo->nb_children++; } else if (check_TOKEN(buf) == TOKEN_NAME) { @@ -1365,7 +1365,7 @@ _exit: return FALSE; }
- buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; + buf->pxo = buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++];
TRACE("Enter optional %s\n", (char*)buf->value); buf->level++; @@ -1376,16 +1376,16 @@ _exit: } buf->level--; buf->pxo = pxo; - buf->pxo->nb_childs++; + buf->pxo->nb_children++; } else break; } }
- if (buf->pxo->nb_childs > MAX_CHILDS) + if (buf->pxo->nb_children > MAX_CHILDREN) { - FIXME("Too many children %d\n", buf->pxo->nb_childs); + FIXME("Too many children %d\n", buf->pxo->nb_children); return FALSE; }