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

d3dxof: Avoid using DPRINTF(). 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-04-08 19:33:30 +02:00
parent b562484d9c
commit 776fae4c60
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3dxof/d3dxof.c
View File

@ -264,7 +264,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV
ULONG i; ULONG i;
TRACE("Registered templates (%d):\n", This->nb_xtemplates); TRACE("Registered templates (%d):\n", This->nb_xtemplates);
for (i = 1; i < This->nb_xtemplates; i++) for (i = 1; i < This->nb_xtemplates; i++)
DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id));
} }
*ppEnumObj = &object->IDirectXFileEnumObject_iface; *ppEnumObj = &object->IDirectXFileEnumObject_iface;
@ -343,7 +343,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP
ULONG i; ULONG i;
TRACE("Registered templates (%d):\n", This->nb_xtemplates); TRACE("Registered templates (%d):\n", This->nb_xtemplates);
for (i = 1; i < This->nb_xtemplates; i++) for (i = 1; i < This->nb_xtemplates; i++)
DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id));
} }
hr = DXFILE_OK; hr = DXFILE_OK;

30
dlls/d3dxof/parsing.c
View File

@ -133,38 +133,38 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate)
clsid = &ptemplate->class_id; clsid = &ptemplate->class_id;
DPRINTF("template %s\n", ptemplate->name); wine_dbg_printf("template %s\n", ptemplate->name);
DPRINTF("{\n"); wine_dbg_printf("{\n");
DPRINTF(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], wine_dbg_printf(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0],
clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]);
for (j = 0; j < ptemplate->nb_members; j++) for (j = 0; j < ptemplate->nb_members; j++)
{ {
if (ptemplate->members[j].nb_dims) if (ptemplate->members[j].nb_dims)
DPRINTF("array "); wine_dbg_printf("array ");
if (ptemplate->members[j].type == TOKEN_NAME) if (ptemplate->members[j].type == TOKEN_NAME)
DPRINTF("%s ", templates_array[ptemplate->members[j].idx_template].name); wine_dbg_printf("%s ", templates_array[ptemplate->members[j].idx_template].name);
else else
DPRINTF("%s ", get_primitive_string(ptemplate->members[j].type)); wine_dbg_printf("%s ", get_primitive_string(ptemplate->members[j].type));
DPRINTF("%s", ptemplate->members[j].name); wine_dbg_printf("%s", ptemplate->members[j].name);
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])
DPRINTF("[%d]", ptemplate->members[j].dim_value[k]); wine_dbg_printf("[%d]", ptemplate->members[j].dim_value[k]);
else else
DPRINTF("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); wine_dbg_printf("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name);
} }
DPRINTF(";\n"); wine_dbg_printf(";\n");
} }
if (ptemplate->open) if (ptemplate->open)
DPRINTF("[...]\n"); wine_dbg_printf("[...]\n");
else if (ptemplate->nb_children) else if (ptemplate->nb_children)
{ {
DPRINTF("[%s", ptemplate->children[0]); wine_dbg_printf("[%s", ptemplate->children[0]);
for (j = 1; j < ptemplate->nb_children; j++) for (j = 1; j < ptemplate->nb_children; j++)
DPRINTF(",%s", ptemplate->children[j]); wine_dbg_printf(",%s", ptemplate->children[j]);
DPRINTF("]\n"); wine_dbg_printf("]\n");
} }
DPRINTF("}\n"); wine_dbg_printf("}\n");
} }
static BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) static BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size)