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

d3dxof: Use buffer start followed by offset when accessing data.

oldstable
Christian Costa 2012-01-23 21:37:48 +01:00 committed by Alexandre Julliard
parent 096e306300
commit bb4c210888
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3dxof/parsing.c
View File

@ -1225,12 +1225,12 @@ static BOOL parse_object_members_list(parse_buffer * buf)
return FALSE; return FALSE;
if (pt->members[i].type == TOKEN_WORD) if (pt->members[i].type == TOKEN_WORD)
{ {
*(((WORD*)(buf->cur_pos_data + buf->pdata))) = (WORD)(*(DWORD*)buf->value); *(((WORD*)(buf->pdata + buf->cur_pos_data))) = (WORD)(*(DWORD*)buf->value);
buf->cur_pos_data += 2; buf->cur_pos_data += 2;
} }
else if (pt->members[i].type == TOKEN_DWORD) else if (pt->members[i].type == TOKEN_DWORD)
{ {
*(((DWORD*)(buf->cur_pos_data + buf->pdata))) = (DWORD)(*(DWORD*)buf->value); *(((DWORD*)(buf->pdata + buf->cur_pos_data))) = (DWORD)(*(DWORD*)buf->value);
buf->cur_pos_data += 4; buf->cur_pos_data += 4;
} }
else else
@ -1247,7 +1247,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
return FALSE; return FALSE;
if (pt->members[i].type == TOKEN_FLOAT) if (pt->members[i].type == TOKEN_FLOAT)
{ {
*(((float*)(buf->cur_pos_data + buf->pdata))) = (float)(*(float*)buf->value); *(((float*)(buf->pdata + buf->cur_pos_data))) = (float)(*(float*)buf->value);
buf->cur_pos_data += 4; buf->cur_pos_data += 4;
} }
else else
@ -1271,7 +1271,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
return FALSE; return FALSE;
} }
strcpy((char*)buf->cur_pstrings, (char*)buf->value); strcpy((char*)buf->cur_pstrings, (char*)buf->value);
*(((LPCSTR*)(buf->cur_pos_data + buf->pdata))) = (char*)buf->cur_pstrings; *(((LPCSTR*)(buf->pdata + buf->cur_pos_data))) = (char*)buf->cur_pstrings;
buf->cur_pstrings += len; buf->cur_pstrings += len;
buf->cur_pos_data += sizeof(LPSTR); buf->cur_pos_data += sizeof(LPSTR);
} }