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

d3dxof: Introduce TOKEN_NONE and TOKEN_ERROR to differentiate end of file from error.

oldstable
Christian Costa 2013-04-28 22:46:09 +02:00 committed by Alexandre Julliard
parent a4d3dbf6a1
commit 1b8b629445
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/d3dxof/parsing.c
View File

@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);
#define XOFFILE_FORMAT_FLOAT_BITS_32 MAKEFOUR('0','0','3','2') #define XOFFILE_FORMAT_FLOAT_BITS_32 MAKEFOUR('0','0','3','2')
#define XOFFILE_FORMAT_FLOAT_BITS_64 MAKEFOUR('0','0','6','4') #define XOFFILE_FORMAT_FLOAT_BITS_64 MAKEFOUR('0','0','6','4')
#define TOKEN_ERROR 0xffff
#define TOKEN_NONE 0
#define TOKEN_NAME 1 #define TOKEN_NAME 1
#define TOKEN_STRING 2 #define TOKEN_STRING 2
#define TOKEN_INTEGER 3 #define TOKEN_INTEGER 3
@ -644,7 +646,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
{ {
char c; char c;
if (!read_bytes(buf, &c, 1)) if (!read_bytes(buf, &c, 1))
return 0; return TOKEN_NONE;
/*TRACE("char = '%c'\n", is_space(c) ? ' ' : c);*/ /*TRACE("char = '%c'\n", is_space(c) ? ' ' : c);*/
if ((c == '#') || (c == '/')) if ((c == '#') || (c == '/'))
{ {
@ -652,15 +654,15 @@ static WORD parse_TOKEN(parse_buffer * buf)
if (c == '/') if (c == '/')
{ {
if (!read_bytes(buf, &c, 1)) if (!read_bytes(buf, &c, 1))
return 0; return TOKEN_ERROR;
if (c != '/') if (c != '/')
return 0; return TOKEN_ERROR;
} }
c = 0; c = 0;
while (c != 0x0A) while (c != 0x0A)
{ {
if (!read_bytes(buf, &c, 1)) if (!read_bytes(buf, &c, 1))
return 0; return TOKEN_NONE;
} }
continue; continue;
} }
@ -710,7 +712,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
} }
FIXME("Unrecognize element\n"); FIXME("Unrecognize element\n");
return 0; return TOKEN_ERROR;
} }
} }
} }
@ -722,13 +724,13 @@ static WORD parse_TOKEN(parse_buffer * buf)
if (!nb_elem) if (!nb_elem)
{ {
if (!read_bytes(buf, &token, 2)) if (!read_bytes(buf, &token, 2))
return 0; return TOKEN_NONE;
/* Convert integer and float list into separate elements */ /* Convert integer and float list into separate elements */
if (token == TOKEN_INTEGER_LIST) if (token == TOKEN_INTEGER_LIST)
{ {
if (!read_bytes(buf, &nb_elem, 4)) if (!read_bytes(buf, &nb_elem, 4))
return 0; return TOKEN_ERROR;
token = TOKEN_INTEGER; token = TOKEN_INTEGER;
is_float = FALSE; is_float = FALSE;
TRACE("Integer list (TOKEN_INTEGER_LIST) of size %d\n", nb_elem); TRACE("Integer list (TOKEN_INTEGER_LIST) of size %d\n", nb_elem);
@ -736,7 +738,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
else if (token == TOKEN_FLOAT_LIST) else if (token == TOKEN_FLOAT_LIST)
{ {
if (!read_bytes(buf, &nb_elem, 4)) if (!read_bytes(buf, &nb_elem, 4))
return 0; return TOKEN_ERROR;
token = TOKEN_FLOAT; token = TOKEN_FLOAT;
is_float = TRUE; is_float = TRUE;
TRACE("Float list (TOKEN_FLOAT_LIST) of size %d\n", nb_elem); TRACE("Float list (TOKEN_FLOAT_LIST) of size %d\n", nb_elem);
@ -751,7 +753,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
DWORD integer; DWORD integer;
if (!read_bytes(buf, &integer, 4)) if (!read_bytes(buf, &integer, 4))
return 0; return TOKEN_ERROR;
*(DWORD*)buf->value = integer; *(DWORD*)buf->value = integer;
} }
@ -767,9 +769,9 @@ static WORD parse_TOKEN(parse_buffer * buf)
char strname[100]; char strname[100];
if (!read_bytes(buf, &count, 4)) if (!read_bytes(buf, &count, 4))
return 0; return TOKEN_ERROR;
if (!read_bytes(buf, strname, count)) if (!read_bytes(buf, strname, count))
return 0; return TOKEN_ERROR;
strname[count] = 0; strname[count] = 0;
/*TRACE("name = %s\n", strname);*/ /*TRACE("name = %s\n", strname);*/
@ -781,7 +783,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
DWORD integer; DWORD integer;
if (!read_bytes(buf, &integer, 4)) if (!read_bytes(buf, &integer, 4))
return 0; return TOKEN_ERROR;
/*TRACE("integer = %ld\n", integer);*/ /*TRACE("integer = %ld\n", integer);*/
*(DWORD*)buf->value = integer; *(DWORD*)buf->value = integer;
@ -793,7 +795,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
GUID class_id; GUID class_id;
if (!read_bytes(buf, &class_id, 16)) if (!read_bytes(buf, &class_id, 16))
return 0; return TOKEN_ERROR;
sprintf(strguid, CLSIDFMT, class_id.Data1, class_id.Data2, class_id.Data3, class_id.Data4[0], sprintf(strguid, CLSIDFMT, class_id.Data1, class_id.Data2, class_id.Data3, class_id.Data4[0],
class_id.Data4[1], class_id.Data4[2], class_id.Data4[3], class_id.Data4[4], class_id.Data4[5], class_id.Data4[1], class_id.Data4[2], class_id.Data4[3], class_id.Data4[4], class_id.Data4[5],
class_id.Data4[6], class_id.Data4[7]); class_id.Data4[6], class_id.Data4[7]);
@ -808,12 +810,12 @@ static WORD parse_TOKEN(parse_buffer * buf)
WORD tmp_token; WORD tmp_token;
char strname[100]; char strname[100];
if (!read_bytes(buf, &count, 4)) if (!read_bytes(buf, &count, 4))
return 0; return TOKEN_ERROR;
if (!read_bytes(buf, strname, count)) if (!read_bytes(buf, strname, count))
return 0; return TOKEN_ERROR;
strname[count] = 0; strname[count] = 0;
if (!read_bytes(buf, &tmp_token, 2)) if (!read_bytes(buf, &tmp_token, 2))
return 0; return TOKEN_ERROR;
if ((tmp_token != TOKEN_COMMA) && (tmp_token != TOKEN_SEMICOLON)) if ((tmp_token != TOKEN_COMMA) && (tmp_token != TOKEN_SEMICOLON))
ERR("No comma or semicolon (got %d)\n", tmp_token); ERR("No comma or semicolon (got %d)\n", tmp_token);
/*TRACE("name = %s\n", strname);*/ /*TRACE("name = %s\n", strname);*/
@ -849,7 +851,7 @@ static WORD parse_TOKEN(parse_buffer * buf)
case TOKEN_ARRAY: case TOKEN_ARRAY:
break; break;
default: default:
return 0; return TOKEN_ERROR;
} }
} }