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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d535205864df15185c097c720f99fa00ab4e10bf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d535205864df15185c097c720f...

Author: Christian Costa <titan.costa(a)wanadoo.fr>
Date:   Sun Nov 30 12:17:20 2008 +0100

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

---

 dlls/d3dxof/d3dxof.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
index dbafcc6..f7c8738 100644
--- a/dlls/d3dxof/d3dxof.c
+++ b/dlls/d3dxof/d3dxof.c
@@ -1874,7 +1874,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
         else
         {
           /* Allow comma omission */
-          if (!((token == TOKEN_FLOAT)))
+          if (!((token == TOKEN_FLOAT) || (token == TOKEN_INTEGER)))
             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);
-      if (token != TOKEN_SEMICOLON)
+      if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA))
       {
         /* 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)