marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dxof: Make parsing more permissive about semicolon and comma in objects.

oldstable
Christian Costa 2008-11-30 12:17:20 +01:00 committed by Alexandre Julliard
parent e32bd2896b
commit d535205864
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3dxof/d3dxof.c
View File

@ -1874,7 +1874,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
else else
{ {
/* Allow comma omission */ /* Allow comma omission */
if (!((token == TOKEN_FLOAT))) if (!((token == TOKEN_FLOAT) || (token == TOKEN_INTEGER)))
return FALSE; return FALSE;
} }
} }
@ -1996,10 +1996,10 @@ static BOOL parse_object_members_list(parse_buffer * buf)
} }
} }
if (buf->txt) if (buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE))
{ {
token = get_TOKEN(buf); token = get_TOKEN(buf);
if (token != TOKEN_SEMICOLON) if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA))
{ {
/* Allow comma instead of semicolon in some specific cases */ /* Allow comma instead of semicolon in some specific cases */
if (!((token == TOKEN_COMMA) && ((i+1) < pt->nb_members) && (pt->members[i].type == pt->members[i+1].type) if (!((token == TOKEN_COMMA) && ((i+1) < pt->nb_members) && (pt->members[i].type == pt->members[i+1].type)