Skip to content

W
wine-fonts
Commit 08c6560e authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

d3dxof: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2d147ce9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 38 deletions
dlls/d3dxof/Makefile.in
View file @ 08c6560e
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = d3dxof.dll MODULE = d3dxof.dll
IMPORTLIB = d3dxof IMPORTLIB = d3dxof
IMPORTS = dxguid uuid ole32 advapi32 IMPORTS = dxguid uuid ole32 advapi32
......
dlls/d3dxof/parsing.c
View file @ 08c6560e
...@@ -147,7 +147,7 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) ...@@ -147,7 +147,7 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate)
for (k = 0; k < ptemplate->members[j].nb_dims; k++) for (k = 0; k < ptemplate->members[j].nb_dims; k++)
{ {
if (ptemplate->members[j].dim_fixed[k]) if (ptemplate->members[j].dim_fixed[k])
wine_dbg_printf("[%d]", ptemplate->members[j].dim_value[k]); wine_dbg_printf("[%ld]", ptemplate->members[j].dim_value[k]);
else else
wine_dbg_printf("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); wine_dbg_printf("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name);
} }
...@@ -237,8 +237,8 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) ...@@ -237,8 +237,8 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr)
if (!read_bytes(buf, &decomp_file_size, sizeof(decomp_file_size))) if (!read_bytes(buf, &decomp_file_size, sizeof(decomp_file_size)))
return DXFILEERR_BADFILETYPE; return DXFILEERR_BADFILETYPE;
TRACE("Compressed format %s detected: decompressed file size with xof header = %d\n", TRACE("Compressed format %s detected: decompressed file size with xof header = %lu.\n",
debugstr_fourcc(header[2]), decomp_file_size); debugstr_fourcc(header[2]), decomp_file_size);
/* Does not take xof header into account */ /* Does not take xof header into account */
decomp_file_size -= 16; decomp_file_size -= 16;
...@@ -274,8 +274,8 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) ...@@ -274,8 +274,8 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr)
} }
if ((decomp_buffer - *decomp_buffer_ptr) != decomp_file_size) if ((decomp_buffer - *decomp_buffer_ptr) != decomp_file_size)
ERR("Size of all decompressed chunks (%u) does not match decompressed file size (%u)\n", ERR("Size of all decompressed chunks (%lu) does not match decompressed file size (%lu).\n",
(DWORD)(decomp_buffer - *decomp_buffer_ptr), decomp_file_size); (DWORD)(decomp_buffer - *decomp_buffer_ptr), decomp_file_size);
/* Use decompressed data */ /* Use decompressed data */
buf->buffer = *decomp_buffer_ptr; buf->buffer = *decomp_buffer_ptr;
...@@ -475,19 +475,20 @@ static BOOL is_guid(parse_buffer* buf) ...@@ -475,19 +475,20 @@ static BOOL is_guid(parse_buffer* buf)
tmp[pos] = 0; tmp[pos] = 0;
if (pos != 38 /* <+36+> */) if (pos != 38 /* <+36+> */)
{ {
TRACE("Wrong guid %s (%d)\n", tmp, pos); TRACE("Wrong guid %s (%lu).\n", tmp, pos);
return FALSE; return FALSE;
} }
buf->buffer += pos; buf->buffer += pos;
buf->rem_bytes -= pos; buf->rem_bytes -= pos;
ret = sscanf(tmp, CLSIDFMT, &class_id.Data1, tab, tab+1, tab+2, tab+3, tab+4, tab+5, tab+6, tab+7, tab+8, tab+9); ret = sscanf(tmp, "<%08lx-%04lx-%04lx-%02lx%02lx-%02lx%02lx%02lx%02lx%02lx%02lx>",
&class_id.Data1, tab, tab+1, tab+2, tab+3, tab+4, tab+5, tab+6, tab+7, tab+8, tab+9);
if (ret != 11) if (ret != 11)
{ {
TRACE("Wrong guid %s (%d)\n", tmp, pos); TRACE("Wrong guid %s (%lu).\n", tmp, pos);
return FALSE; return FALSE;
} }
TRACE("Found guid %s (%d)\n", tmp, pos); TRACE("Found guid %s (%lu).\n", tmp, pos);
class_id.Data2 = tab[0]; class_id.Data2 = tab[0];
class_id.Data3 = tab[1]; class_id.Data3 = tab[1];
...@@ -588,9 +589,9 @@ static BOOL is_integer(parse_buffer* buf) ...@@ -588,9 +589,9 @@ static BOOL is_integer(parse_buffer* buf)
buf->buffer += pos; buf->buffer += pos;
buf->rem_bytes -= pos; buf->rem_bytes -= pos;
sscanf(tmp, "%d", &integer); sscanf(tmp, "%ld", &integer);
TRACE("Found integer %s - %d\n", tmp, integer); TRACE("Found integer %s - %ld.\n", tmp, integer);
*(DWORD*)buf->value = integer; *(DWORD*)buf->value = integer;
...@@ -725,19 +726,19 @@ static WORD parse_TOKEN(parse_buffer * buf) ...@@ -725,19 +726,19 @@ static WORD parse_TOKEN(parse_buffer * buf)
/* 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, &buf->list_nb_elements, 4)) if (!read_bytes(buf, &buf->list_nb_elements, 4))
return TOKEN_ERROR; return TOKEN_ERROR;
token = TOKEN_INTEGER; token = TOKEN_INTEGER;
buf->list_type_float = FALSE; buf->list_type_float = FALSE;
TRACE("Integer list (TOKEN_INTEGER_LIST) of size %d\n", buf->list_nb_elements); TRACE("Integer list (TOKEN_INTEGER_LIST) of size %lu.\n", buf->list_nb_elements);
} }
else if (token == TOKEN_FLOAT_LIST) else if (token == TOKEN_FLOAT_LIST)
{ {
if (!read_bytes(buf, &buf->list_nb_elements, 4)) if (!read_bytes(buf, &buf->list_nb_elements, 4))
return TOKEN_ERROR; return TOKEN_ERROR;
token = TOKEN_FLOAT; token = TOKEN_FLOAT;
buf->list_type_float = TRUE; buf->list_type_float = TRUE;
TRACE("Float list (TOKEN_FLOAT_LIST) of size %d\n", buf->list_nb_elements); TRACE("Float list (TOKEN_FLOAT_LIST) of size %lu.\n", buf->list_nb_elements);
} }
} }
...@@ -783,16 +784,16 @@ static WORD parse_TOKEN(parse_buffer * buf) ...@@ -783,16 +784,16 @@ static WORD parse_TOKEN(parse_buffer * buf)
} }
break; break;
case TOKEN_INTEGER: case TOKEN_INTEGER:
{ {
DWORD integer; DWORD integer;
if (!read_bytes(buf, &integer, 4)) if (!read_bytes(buf, &integer, 4))
return TOKEN_ERROR; return TOKEN_ERROR;
TRACE("integer = %u\n", integer); TRACE("integer = %lu.\n", integer);
*(DWORD*)buf->value = integer; *(DWORD *)buf->value = integer;
} break;
break; }
case TOKEN_GUID: case TOKEN_GUID:
{ {
char strguid[39]; char strguid[39];
...@@ -1089,7 +1090,8 @@ static BOOL parse_template(parse_buffer * buf) ...@@ -1089,7 +1090,8 @@ static BOOL parse_template(parse_buffer * buf)
if (get_TOKEN(buf) != TOKEN_CBRACE) if (get_TOKEN(buf) != TOKEN_CBRACE)
return FALSE; return FALSE;
TRACE("%d - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id)); TRACE("%lu - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name,
debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id));
buf->pdxf->nb_xtemplates++; buf->pdxf->nb_xtemplates++;
return TRUE; return TRUE;
...@@ -1161,7 +1163,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) ...@@ -1161,7 +1163,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
nb_elems *= *(DWORD*)(buf->pxo->root->pdata + buf->pxo->members[pt->members[i].dim_value[k]].start); nb_elems *= *(DWORD*)(buf->pxo->root->pdata + buf->pxo->members[pt->members[i].dim_value[k]].start);
} }
TRACE("Elements to consider: %u\n", nb_elems); TRACE("Elements to consider: %lu.\n", nb_elems);
for (k = 0; k < nb_elems; k++) for (k = 0; k < nb_elems; k++)
{ {
...@@ -1201,7 +1203,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) ...@@ -1201,7 +1203,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
if (token == TOKEN_INTEGER) if (token == TOKEN_INTEGER)
{ {
get_TOKEN(buf); get_TOKEN(buf);
TRACE("%s = %d\n", pt->members[i].name, *(DWORD*)buf->value); TRACE("%s = %ld.\n", pt->members[i].name, *(DWORD *)buf->value);
/* Assume larger size */ /* Assume larger size */
if (!check_buffer(buf, 4)) if (!check_buffer(buf, 4))
return FALSE; return FALSE;
...@@ -1217,7 +1219,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) ...@@ -1217,7 +1219,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
} }
else else
{ {
FIXME("Token %d not supported\n", pt->members[i].type); FIXME("Token %ld not supported.\n", pt->members[i].type);
return FALSE; return FALSE;
} }
} }
...@@ -1234,7 +1236,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) ...@@ -1234,7 +1236,7 @@ static BOOL parse_object_members_list(parse_buffer * buf)
} }
else else
{ {
FIXME("Token %d not supported\n", pt->members[i].type); FIXME("Token %ld not supported.\n", pt->members[i].type);
return FALSE; return FALSE;
} }
} }
...@@ -1259,13 +1261,13 @@ static BOOL parse_object_members_list(parse_buffer * buf) ...@@ -1259,13 +1261,13 @@ static BOOL parse_object_members_list(parse_buffer * buf)
} }
else else
{ {
FIXME("Token %d not supported\n", pt->members[i].type); FIXME("Token %ld not supported.\n", pt->members[i].type);
return FALSE; return FALSE;
} }
} }
else else
{ {
WARN("Unexpected token %d\n", token); WARN("Unexpected token %ld.\n", token);
return FALSE; return FALSE;
} }
} }
...@@ -1369,7 +1371,7 @@ _exit: ...@@ -1369,7 +1371,7 @@ _exit:
if (buf->pxo->nb_children > MAX_CHILDREN) if (buf->pxo->nb_children > MAX_CHILDREN)
{ {
FIXME("Too many children %d\n", buf->pxo->nb_children); FIXME("Too many children: %lu.\n", buf->pxo->nb_children);
return FALSE; return FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment