Skip to content

W
wine-cw
Commit 2e24a148 authored by Tony Lambregts's avatar Tony Lambregts Committed by Alexandre Julliard
Browse files
Options

Replace DPRINTF with TRACE.

parent bb5ce05e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 149 deletions
controls/listbox.c
View file @ 2e24a148
......@@ -750,9 +750,9 @@ static BOOL LISTBOX_SetTabStops( HWND hwnd, LB_DESCR *descr, INT count,
TRACE("[%p]: settabstops ", hwnd );
for (i = 0; i < descr->nb_tabs; i++) {
descr->tabs[i] = *p++<<1; /* FIXME */
if (TRACE_ON(listbox)) DPRINTF("%hd ", descr->tabs[i]);
if (TRACE_ON(listbox)) TRACE("%hd ", descr->tabs[i]);
}
if (TRACE_ON(listbox)) DPRINTF("\n");
if (TRACE_ON(listbox)) TRACE("\n");
}
else memcpy( descr->tabs, tabs, descr->nb_tabs * sizeof(INT) );
/* FIXME: repaint the window? */
......
controls/scroll.c
View file @ 2e24a148
......@@ -1560,10 +1560,10 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
if (TRACE_ON(scroll))
{
TRACE("hwnd=%p bar=%d", hwnd, nBar);
if (info->fMask & SIF_PAGE) DPRINTF( " page=%d", info->nPage );
if (info->fMask & SIF_POS) DPRINTF( " pos=%d", info->nPos );
if (info->fMask & SIF_RANGE) DPRINTF( " min=%d max=%d", info->nMin, info->nMax );
DPRINTF("\n");
if (info->fMask & SIF_PAGE) TRACE( " page=%d", info->nPage );
if (info->fMask & SIF_POS) TRACE( " pos=%d", info->nPos );
if (info->fMask & SIF_RANGE) TRACE( " min=%d max=%d", info->nMin, info->nMax );
TRACE("\n");
}
/* Set the page size */
......
dlls/comcat/information.c
View file @ 2e24a148
......@@ -200,10 +200,10 @@ static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories(
ULONG count;
TRACE("\n\tCLSID:\t%s\n\tImplemented %lu\n",debugstr_guid(rclsid),cImplemented);
for (count = 0; count < cImplemented; ++count)
DPRINTF("\t\t%s\n",debugstr_guid(&rgcatidImpl[count]));
DPRINTF("\tRequired %lu\n",cRequired);
TRACE("\t\t%s\n",debugstr_guid(&rgcatidImpl[count]));
TRACE("\tRequired %lu\n",cRequired);
for (count = 0; count < cRequired; ++count)
DPRINTF("\t\t%s\n",debugstr_guid(&rgcatidReq[count]));
TRACE("\t\t%s\n",debugstr_guid(&rgcatidReq[count]));
}
if ((cImplemented && rgcatidImpl == NULL) ||
......
dlls/ddraw/d3ddevice/main.c
View file @ 2e24a148
......@@ -968,9 +968,9 @@ Main_IDirect3DDeviceImpl_7_GetInfo(LPDIRECT3DDEVICE7 iface,
if (TRACE_ON(ddraw)) {
TRACE(" info requested : ");
switch (dwDevInfoID) {
case D3DDEVINFOID_TEXTUREMANAGER: DPRINTF("D3DDEVINFOID_TEXTUREMANAGER\n"); break;
case D3DDEVINFOID_D3DTEXTUREMANAGER: DPRINTF("D3DDEVINFOID_D3DTEXTUREMANAGER\n"); break;
case D3DDEVINFOID_TEXTURING: DPRINTF("D3DDEVINFOID_TEXTURING\n"); break;
case D3DDEVINFOID_TEXTUREMANAGER: TRACE("D3DDEVINFOID_TEXTUREMANAGER\n"); break;
case D3DDEVINFOID_D3DTEXTUREMANAGER: TRACE("D3DDEVINFOID_D3DTEXTUREMANAGER\n"); break;
case D3DDEVINFOID_TEXTURING: TRACE("D3DDEVINFOID_TEXTURING\n"); break;
default: ERR(" invalid flag !!!\n"); return DDERR_INVALIDPARAMS;
}
}
......
dlls/ddraw/d3ddevice/mesa.c
View file @ 2e24a148
......@@ -1171,12 +1171,12 @@ static void draw_primitive_strided(IDirect3DDeviceImpl *This,
if (d3dvtVertexType & D3DFVF_NORMAL) {
D3DVALUE *normal =
(D3DVALUE *) (((char *) lpD3DDrawPrimStrideData->normal.lpvData) + i * lpD3DDrawPrimStrideData->normal.dwStride);
DPRINTF(" / %f %f %f", normal[0], normal[1], normal[2]);
TRACE(" / %f %f %f", normal[0], normal[1], normal[2]);
}
if (d3dvtVertexType & D3DFVF_DIFFUSE) {
DWORD *color_d =
(DWORD *) (((char *) lpD3DDrawPrimStrideData->diffuse.lpvData) + i * lpD3DDrawPrimStrideData->diffuse.dwStride);
DPRINTF(" / %02lx %02lx %02lx %02lx",
TRACE(" / %02lx %02lx %02lx %02lx",
(*color_d >> 16) & 0xFF,
(*color_d >> 8) & 0xFF,
(*color_d >> 0) & 0xFF,
......@@ -1185,7 +1185,7 @@ static void draw_primitive_strided(IDirect3DDeviceImpl *This,
if (d3dvtVertexType & D3DFVF_SPECULAR) {
DWORD *color_s =
(DWORD *) (((char *) lpD3DDrawPrimStrideData->specular.lpvData) + i * lpD3DDrawPrimStrideData->specular.dwStride);
DPRINTF(" / %02lx %02lx %02lx %02lx",
TRACE(" / %02lx %02lx %02lx %02lx",
(*color_s >> 16) & 0xFF,
(*color_s >> 8) & 0xFF,
(*color_s >> 0) & 0xFF,
......@@ -1195,9 +1195,9 @@ static void draw_primitive_strided(IDirect3DDeviceImpl *This,
D3DVALUE *tex_coord =
(D3DVALUE *) (((char *) lpD3DDrawPrimStrideData->textureCoords[tex_index].lpvData) +
i * lpD3DDrawPrimStrideData->textureCoords[tex_index].dwStride);
DPRINTF(" / %f %f", tex_coord[0], tex_coord[1]);
TRACE(" / %f %f", tex_coord[0], tex_coord[1]);
}
DPRINTF("\n");
TRACE("\n");
}
}
} else {
......@@ -1427,7 +1427,7 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
if (TRACE_ON(ddraw)) {
TRACE(" Stage type is : ");
switch (d3dTexStageStateType) {
#define GEN_CASE(a) case a: DPRINTF(#a " "); break
#define GEN_CASE(a) case a: TRACE(#a " "); break
GEN_CASE(D3DTSS_COLOROP);
GEN_CASE(D3DTSS_COLORARG1);
GEN_CASE(D3DTSS_COLORARG2);
......@@ -1453,18 +1453,18 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
GEN_CASE(D3DTSS_BUMPENVLOFFSET);
GEN_CASE(D3DTSS_TEXTURETRANSFORMFLAGS);
#undef GEN_CASE
default: DPRINTF("UNKNOWN !!!");
default: TRACE("UNKNOWN !!!");
}
DPRINTF(" => ");
TRACE(" => ");
}
switch (d3dTexStageStateType) {
case D3DTSS_MINFILTER:
if (TRACE_ON(ddraw)) {
switch ((D3DTEXTUREMINFILTER) dwState) {
case D3DTFN_POINT: DPRINTF("D3DTFN_POINT\n"); break;
case D3DTFN_LINEAR: DPRINTF("D3DTFN_LINEAR\n"); break;
default: DPRINTF(" state unhandled (%ld).\n", dwState); break;
case D3DTFN_POINT: TRACE("D3DTFN_POINT\n"); break;
case D3DTFN_LINEAR: TRACE("D3DTFN_LINEAR\n"); break;
default: TRACE(" state unhandled (%ld).\n", dwState); break;
}
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, convert_min_filter_to_GL(dwState));
......@@ -1473,9 +1473,9 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
case D3DTSS_MAGFILTER:
if (TRACE_ON(ddraw)) {
switch ((D3DTEXTUREMAGFILTER) dwState) {
case D3DTFG_POINT: DPRINTF("D3DTFN_POINT\n"); break;
case D3DTFG_LINEAR: DPRINTF("D3DTFN_LINEAR\n"); break;
default: DPRINTF(" state unhandled (%ld).\n", dwState); break;
case D3DTFG_POINT: TRACE("D3DTFN_POINT\n"); break;
case D3DTFG_LINEAR: TRACE("D3DTFN_LINEAR\n"); break;
default: TRACE(" state unhandled (%ld).\n", dwState); break;
}
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, convert_mag_filter_to_GL(dwState));
......@@ -1486,10 +1486,10 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
case D3DTSS_ADDRESSV: {
GLenum arg = GL_REPEAT; /* Default value */
switch ((D3DTEXTUREADDRESS) dwState) {
case D3DTADDRESS_WRAP: if (TRACE_ON(ddraw)) DPRINTF("D3DTADDRESS_WRAP\n"); arg = GL_REPEAT; break;
case D3DTADDRESS_CLAMP: if (TRACE_ON(ddraw)) DPRINTF("D3DTADDRESS_CLAMP\n"); arg = GL_CLAMP; break;
case D3DTADDRESS_BORDER: if (TRACE_ON(ddraw)) DPRINTF("D3DTADDRESS_BORDER\n"); arg = GL_CLAMP_TO_EDGE; break;
default: DPRINTF(" state unhandled (%ld).\n", dwState);
case D3DTADDRESS_WRAP: if (TRACE_ON(ddraw)) TRACE("D3DTADDRESS_WRAP\n"); arg = GL_REPEAT; break;
case D3DTADDRESS_CLAMP: if (TRACE_ON(ddraw)) TRACE("D3DTADDRESS_CLAMP\n"); arg = GL_CLAMP; break;
case D3DTADDRESS_BORDER: if (TRACE_ON(ddraw)) TRACE("D3DTADDRESS_BORDER\n"); arg = GL_CLAMP_TO_EDGE; break;
default: TRACE(" state unhandled (%ld).\n", dwState);
}
if ((d3dTexStageStateType == D3DTSS_ADDRESS) ||
(d3dTexStageStateType == D3DTSS_ADDRESSU))
......@@ -1500,7 +1500,7 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
} break;
default:
if (TRACE_ON(ddraw)) DPRINTF(" unhandled.\n");
if (TRACE_ON(ddraw)) TRACE(" unhandled.\n");
}
This->state_block.texture_stage_state[dwStage][d3dTexStageStateType - 1] = dwState;
......
dlls/ddraw/d3dexecutebuffer.c
View file @ 2e24a148
......@@ -154,22 +154,22 @@ static void _dump_D3DEXECUTEBUFFERDESC(LPD3DEXECUTEBUFFERDESC lpDesc) {
if (TRACE_ON(ddraw)) { \
/* Wireframe */ \
if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1) \
DPRINTF("EDGEENABLE1 "); \
TRACE("EDGEENABLE1 "); \
if (ci->wFlags & D3DTRIFLAG_EDGEENABLE2) \
DPRINTF("EDGEENABLE2 "); \
TRACE("EDGEENABLE2 "); \
if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1) \
DPRINTF("EDGEENABLE3 "); \
TRACE("EDGEENABLE3 "); \
\
/* Strips / Fans */ \
if (ci->wFlags == D3DTRIFLAG_EVEN) \
DPRINTF("EVEN "); \
TRACE("EVEN "); \
if (ci->wFlags == D3DTRIFLAG_ODD) \
DPRINTF("ODD "); \
TRACE("ODD "); \
if (ci->wFlags == D3DTRIFLAG_START) \
DPRINTF("START "); \
TRACE("START "); \
if ((ci->wFlags > 0) && (ci->wFlags < 30)) \
DPRINTF("STARTFLAT(%d) ", ci->wFlags); \
DPRINTF("\n"); \
TRACE("STARTFLAT(%d) ", ci->wFlags); \
TRACE("\n"); \
} \
\
/* Draw the triangle */ \
......@@ -461,18 +461,18 @@ static void execute(IDirect3DExecuteBufferImpl *This,
TRACE(" Flags : ");
if (TRACE_ON(ddraw)) {
if (ci->dwFlags & D3DPROCESSVERTICES_COPY)
DPRINTF("COPY ");
TRACE("COPY ");
if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR)
DPRINTF("NOCOLOR ");
TRACE("NOCOLOR ");
if (ci->dwFlags == D3DPROCESSVERTICES_OPMASK)
DPRINTF("OPMASK ");
TRACE("OPMASK ");
if (ci->dwFlags & D3DPROCESSVERTICES_TRANSFORM)
DPRINTF("TRANSFORM ");
TRACE("TRANSFORM ");
if (ci->dwFlags == D3DPROCESSVERTICES_TRANSFORMLIGHT)
DPRINTF("TRANSFORMLIGHT ");
TRACE("TRANSFORMLIGHT ");
if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS)
DPRINTF("UPDATEEXTENTS ");
DPRINTF("\n");
TRACE("UPDATEEXTENTS ");
TRACE("\n");
}
/* This is where doing Direct3D on top on OpenGL is quite difficult.
......
dlls/ddraw/d3dvertexbuffer.c
View file @ 2e24a148
......@@ -365,12 +365,12 @@ process_vertices_strided(IDirect3DVertexBufferImpl *This,
if (dwVertexTypeDesc & D3DFVF_NORMAL) {
D3DVALUE *normal =
(D3DVALUE *) (((char *) lpStrideData->normal.lpvData) + i * lpStrideData->normal.dwStride);
DPRINTF(" / %f %f %f", normal[0], normal[1], normal[2]);
TRACE(" / %f %f %f", normal[0], normal[1], normal[2]);
}
if (dwVertexTypeDesc & D3DFVF_DIFFUSE) {
DWORD *color_d =
(DWORD *) (((char *) lpStrideData->diffuse.lpvData) + i * lpStrideData->diffuse.dwStride);
DPRINTF(" / %02lx %02lx %02lx %02lx",
TRACE(" / %02lx %02lx %02lx %02lx",
(*color_d >> 16) & 0xFF,
(*color_d >> 8) & 0xFF,
(*color_d >> 0) & 0xFF,
......@@ -379,7 +379,7 @@ process_vertices_strided(IDirect3DVertexBufferImpl *This,
if (dwVertexTypeDesc & D3DFVF_SPECULAR) {
DWORD *color_s =
(DWORD *) (((char *) lpStrideData->specular.lpvData) + i * lpStrideData->specular.dwStride);
DPRINTF(" / %02lx %02lx %02lx %02lx",
TRACE(" / %02lx %02lx %02lx %02lx",
(*color_s >> 16) & 0xFF,
(*color_s >> 8) & 0xFF,
(*color_s >> 0) & 0xFF,
......@@ -389,9 +389,9 @@ process_vertices_strided(IDirect3DVertexBufferImpl *This,
D3DVALUE *tex_coord =
(D3DVALUE *) (((char *) lpStrideData->textureCoords[tex_index].lpvData) +
i * lpStrideData->textureCoords[tex_index].dwStride);
DPRINTF(" / %f %f", tex_coord[0], tex_coord[1]);
TRACE(" / %f %f", tex_coord[0], tex_coord[1]);
}
DPRINTF("\n");
TRACE("\n");
}
}
......@@ -419,8 +419,8 @@ GL_IDirect3DVertexBufferImpl_7_1T_ProcessVertices(LPDIRECT3DVERTEXBUFFER7 iface,
TRACE("(%p/%p)->(%08lx,%08lx,%08lx,%p,%08lx,%p,%08lx)\n", This, iface, dwVertexOp, dwDestIndex, dwCount, lpSrcBuffer, dwSrcIndex, lpD3DDevice, dwFlags);
if (TRACE_ON(ddraw)) {
DPRINTF(" - vertex operations : "); dump_D3DVOP(dwVertexOp);
DPRINTF(" - flags : "); dump_D3DPV(dwFlags);
TRACE(" - vertex operations : "); dump_D3DVOP(dwVertexOp);
TRACE(" - flags : "); dump_D3DPV(dwFlags);
}
if ((dwVertexOp & D3DVOP_TRANSFORM) == 0) return DDERR_INVALIDPARAMS;
......@@ -446,9 +446,9 @@ GL_IDirect3DVertexBufferImpl_7_ProcessVerticesStrided(LPDIRECT3DVERTEXBUFFER7 if
TRACE("(%p/%p)->(%08lx,%08lx,%08lx,%p,%08lx,%p,%08lx)\n", This, iface, dwVertexOp, dwDestIndex, dwCount, lpStrideData, dwVertexTypeDesc, lpD3DDevice, dwFlags);
if (TRACE_ON(ddraw)) {
DPRINTF(" - vertex operations : "); dump_D3DVOP(dwVertexOp);
DPRINTF(" - flags : "); dump_D3DPV(dwFlags);
DPRINTF(" - vertex format : "); dump_flexible_vertex(dwVertexTypeDesc);
TRACE(" - vertex operations : "); dump_D3DVOP(dwVertexOp);
TRACE(" - flags : "); dump_D3DPV(dwFlags);
TRACE(" - vertex format : "); dump_flexible_vertex(dwVertexTypeDesc);
}
if ((dwVertexOp & D3DVOP_TRANSFORM) == 0) return DDERR_INVALIDPARAMS;
......
dlls/ddraw/ddraw/main.c
View file @ 2e24a148
......@@ -543,7 +543,7 @@ Main_DirectDraw_CreateSurface(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD,
TRACE("(%p)->(%p,%p,%p)\n",This,pDDSD,ppSurf,pUnkOuter);
if (TRACE_ON(ddraw)) {
DPRINTF("Requesting surface desc :\n");
TRACE("Requesting surface desc :\n");
DDRAW_dump_surface_desc(pDDSD);
}
......@@ -851,14 +851,14 @@ Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps,
if (pDriverCaps != NULL) {
DD_STRUCT_COPY_BYSIZE(pDriverCaps,&This->caps);
if (TRACE_ON(ddraw)) {
DPRINTF("Driver Caps : \n");
TRACE("Driver Caps : \n");
DDRAW_dump_DDCAPS(pDriverCaps);
}
}
if (pHELCaps != NULL) {
DD_STRUCT_COPY_BYSIZE(pHELCaps,&This->caps);
if (TRACE_ON(ddraw)) {
DPRINTF("HEL Caps : \n");
TRACE("HEL Caps : \n");
DDRAW_dump_DDCAPS(pHELCaps);
}
}
......@@ -1135,7 +1135,7 @@ Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps,
if (TRACE_ON(ddraw)) {
TRACE(" Asking for memory of type : ");
DDRAW_dump_DDSCAPS2(ddscaps); DPRINTF("\n");
DDRAW_dump_DDSCAPS2(ddscaps); TRACE("\n");
}
/* We have 16 MB videomemory */
......
dlls/ddraw/dsurface/main.c
View file @ 2e24a148
......@@ -625,7 +625,7 @@ Main_DirectDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
if (TRACE_ON(ddraw)) {
TRACE("(%p)->Looking for caps: %lx,%lx,%lx,%lx output: %p\n",This,pCaps->dwCaps, pCaps->dwCaps2,
pCaps->dwCaps3, pCaps->dwCaps4, ppSurface);
DPRINTF(" Caps are : "); DDRAW_dump_DDSCAPS2(pCaps); DPRINTF("\n");
TRACE(" Caps are : "); DDRAW_dump_DDSCAPS2(pCaps); TRACE("\n");
}
our_caps = *pCaps;
......@@ -636,7 +636,7 @@ Main_DirectDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
our_caps.dwCaps3 = 0;
our_caps.dwCaps4 = 0;
if (TRACE_ON(ddraw)) {
DPRINTF(" Real caps are : "); DDRAW_dump_DDSCAPS2(&our_caps); DPRINTF("\n");
TRACE(" Real caps are : "); DDRAW_dump_DDSCAPS2(&our_caps); TRACE("\n");
}
}
......@@ -648,7 +648,7 @@ Main_DirectDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface,
surf->surface_desc.ddsCaps.dwCaps2,
surf->surface_desc.ddsCaps.dwCaps3,
surf->surface_desc.ddsCaps.dwCaps4);
DPRINTF(" Surface caps are : "); DDRAW_dump_DDSCAPS2(&(surf->surface_desc.ddsCaps)); DPRINTF("\n");
TRACE(" Surface caps are : "); DDRAW_dump_DDSCAPS2(&(surf->surface_desc.ddsCaps)); TRACE("\n");
}
if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) &&
((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2))
......
dlls/ddraw/main.c
View file @ 2e24a148
......@@ -65,14 +65,14 @@ HRESULT WINAPI DirectDrawEnumerateExA(
TRACE("(%p,%p, %08lx)\n", lpCallback, lpContext, dwFlags);
if (TRACE_ON(ddraw)) {
DPRINTF(" Flags : ");
TRACE(" Flags : ");
if (dwFlags & DDENUM_ATTACHEDSECONDARYDEVICES)
DPRINTF("DDENUM_ATTACHEDSECONDARYDEVICES ");
TRACE("DDENUM_ATTACHEDSECONDARYDEVICES ");
if (dwFlags & DDENUM_DETACHEDSECONDARYDEVICES)
DPRINTF("DDENUM_DETACHEDSECONDARYDEVICES ");
TRACE("DDENUM_DETACHEDSECONDARYDEVICES ");
if (dwFlags & DDENUM_NONDISPLAYDEVICES)
DPRINTF("DDENUM_NONDISPLAYDEVICES ");
DPRINTF("\n");
TRACE("DDENUM_NONDISPLAYDEVICES ");
TRACE("\n");
}
for (i=0; i<DDRAW_num_drivers; i++)
......
dlls/dinput/joystick/linux.c
View file @ 2e24a148
......@@ -447,9 +447,9 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags);
if (TRACE_ON(dinput)) {
DPRINTF(" - flags = ");
TRACE(" - flags = ");
_dump_EnumObjects_flags(dwFlags);
DPRINTF("\n");
TRACE("\n");
}
/* Only the fields till dwFFMaxForce are relevant */
......
dlls/dinput/joystick/linuxinput.c
View file @ 2e24a148
......@@ -676,9 +676,9 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags);
if (TRACE_ON(dinput)) {
DPRINTF(" - flags = ");
TRACE(" - flags = ");
_dump_EnumObjects_flags(dwFlags);
DPRINTF("\n");
TRACE("\n");
}
if (xfd == -1) return DIERR_NOTACQUIRED;
......
dlls/dinput/keyboard/main.c
View file @ 2e24a148
......@@ -355,9 +355,9 @@ static HRESULT WINAPI SysKeyboardAImpl_EnumObjects(
TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags);
if (TRACE_ON(dinput)) {
DPRINTF(" - flags = ");
TRACE(" - flags = ");
_dump_EnumObjects_flags(dwFlags);
DPRINTF("\n");
TRACE("\n");
}
/* Only the fields till dwFFMaxForce are relevant */
......
dlls/dinput/mouse/main.c
View file @ 2e24a148
......@@ -868,9 +868,9 @@ static HRESULT WINAPI SysMouseAImpl_EnumObjects(
TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags);
if (TRACE_ON(dinput)) {
DPRINTF(" - flags = ");
TRACE(" - flags = ");
_dump_EnumObjects_flags(dwFlags);
DPRINTF("\n");
TRACE("\n");
}
/* Only the fields till dwFFMaxForce are relevant */
......
dlls/odbc32/proxyodbc.c
View file @ 2e24a148
......@@ -600,10 +600,10 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle,
{
TRACE("returns: %d \t", ret);
if (*NameLength1 > 0)
DPRINTF("DataSource = %s,", ServerName);
TRACE("DataSource = %s,", ServerName);
if (*NameLength2 > 0)
DPRINTF(" Description = %s", Description);
DPRINTF("\n");
TRACE(" Description = %s", Description);
TRACE("\n");
}
return ret;
......
dlls/setupapi/parser.c
View file @ 2e24a148
......@@ -1680,8 +1680,8 @@ BOOL WINAPI SetupGetBinaryField( const INFCONTEXT *context, DWORD index, BYTE *b
{
TRACE( "%p/%p/%d/%d index %ld returning",
context->Inf, context->CurrentInf, context->Section, context->Line, index );
for (i = index; i < line->nb_fields; i++) DPRINTF( " %02x", buffer[i - index] );
DPRINTF( "\n" );
for (i = index; i < line->nb_fields; i++) TRACE( " %02x", buffer[i - index] );
TRACE( "\n" );
}
return TRUE;
}
......
dlls/version/info.c
View file @ 2e24a148
......@@ -59,28 +59,28 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
);
TRACE("(");
DPRINTF(" OS=0x%x.0x%x ",
TRACE(" OS=0x%x.0x%x ",
HIWORD(vffi->dwFileOS),
LOWORD(vffi->dwFileOS)
);
switch (vffi->dwFileOS&0xFFFF0000) {
case VOS_DOS:DPRINTF("DOS,");break;
case VOS_OS216:DPRINTF("OS/2-16,");break;
case VOS_OS232:DPRINTF("OS/2-32,");break;
case VOS_NT:DPRINTF("NT,");break;
case VOS_DOS:TRACE("DOS,");break;
case VOS_OS216:TRACE("OS/2-16,");break;
case VOS_OS232:TRACE("OS/2-32,");break;
case VOS_NT:TRACE("NT,");break;
case VOS_UNKNOWN:
default:
DPRINTF("UNKNOWN(0x%lx),",vffi->dwFileOS&0xFFFF0000);break;
TRACE("UNKNOWN(0x%lx),",vffi->dwFileOS&0xFFFF0000);break;
}
switch (LOWORD(vffi->dwFileOS)) {
case VOS__BASE:DPRINTF("BASE");break;
case VOS__WINDOWS16:DPRINTF("WIN16");break;
case VOS__WINDOWS32:DPRINTF("WIN32");break;
case VOS__PM16:DPRINTF("PM16");break;
case VOS__PM32:DPRINTF("PM32");break;
default:DPRINTF("UNKNOWN(0x%x)",LOWORD(vffi->dwFileOS));break;
case VOS__BASE:TRACE("BASE");break;
case VOS__WINDOWS16:TRACE("WIN16");break;
case VOS__WINDOWS32:TRACE("WIN32");break;
case VOS__PM16:TRACE("PM16");break;
case VOS__PM32:TRACE("PM32");break;
default:TRACE("UNKNOWN(0x%x)",LOWORD(vffi->dwFileOS));break;
}
DPRINTF(")\n");
TRACE(")\n");
switch (vffi->dwFileType) {
default:
......@@ -94,40 +94,40 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
switch(vffi->dwFileSubtype) {
default:
case VFT2_UNKNOWN:
DPRINTF("UNKNOWN(0x%lx)",vffi->dwFileSubtype);
TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);
break;
case VFT2_DRV_PRINTER:
DPRINTF("PRINTER");
TRACE("PRINTER");
break;
case VFT2_DRV_KEYBOARD:
DPRINTF("KEYBOARD");
TRACE("KEYBOARD");
break;
case VFT2_DRV_LANGUAGE:
DPRINTF("LANGUAGE");
TRACE("LANGUAGE");
break;
case VFT2_DRV_DISPLAY:
DPRINTF("DISPLAY");
TRACE("DISPLAY");
break;
case VFT2_DRV_MOUSE:
DPRINTF("MOUSE");
TRACE("MOUSE");
break;
case VFT2_DRV_NETWORK:
DPRINTF("NETWORK");
TRACE("NETWORK");
break;
case VFT2_DRV_SYSTEM:
DPRINTF("SYSTEM");
TRACE("SYSTEM");
break;
case VFT2_DRV_INSTALLABLE:
DPRINTF("INSTALLABLE");
TRACE("INSTALLABLE");
break;
case VFT2_DRV_SOUND:
DPRINTF("SOUND");
TRACE("SOUND");
break;
case VFT2_DRV_COMM:
DPRINTF("COMM");
TRACE("COMM");
break;
case VFT2_DRV_INPUTMETHOD:
DPRINTF("INPUTMETHOD");
TRACE("INPUTMETHOD");
break;
}
break;
......@@ -135,17 +135,17 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
TRACE("filetype=FONT.");
switch (vffi->dwFileSubtype) {
default:
DPRINTF("UNKNOWN(0x%lx)",vffi->dwFileSubtype);
TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);
break;
case VFT2_FONT_RASTER:DPRINTF("RASTER");break;
case VFT2_FONT_VECTOR:DPRINTF("VECTOR");break;
case VFT2_FONT_TRUETYPE:DPRINTF("TRUETYPE");break;
case VFT2_FONT_RASTER:TRACE("RASTER");break;
case VFT2_FONT_VECTOR:TRACE("VECTOR");break;
case VFT2_FONT_TRUETYPE:TRACE("TRUETYPE");break;
}
break;
case VFT_VXD:TRACE("filetype=VXD");break;
case VFT_STATIC_LIB:TRACE("filetype=STATIC_LIB");break;
}
DPRINTF("\n");
TRACE("\n");
TRACE(" filedata=0x%lx.0x%lx\n",
vffi->dwFileDateMS,vffi->dwFileDateLS);
}
......
dlls/winaspi/winaspi16.c
View file @ 2e24a148
......@@ -184,12 +184,12 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb, UINT16 mode)
cmd = prb->CDBByte[0];
if (TRACE_ON(aspi))
{
DPRINTF("CDB buffer[");
TRACE("CDB buffer[");
for (i = 0; i < prb->SRB_CDBLen; i++) {
if (i != 0) DPRINTF(",");
DPRINTF("%02x", *cdb++);
if (i != 0) TRACE(",");
TRACE("%02x", *cdb++);
}
DPRINTF("]\n");
TRACE("]\n");
}
}
......@@ -202,12 +202,12 @@ ASPI_PrintSenseArea16(SRB_ExecSCSICmd16 *prb)
if (TRACE_ON(aspi))
{
cdb = &prb->CDBByte[0];
DPRINTF("SenseArea[");
TRACE("SenseArea[");
for (i = 0; i < prb->SRB_SenseLen; i++) {
if (i) DPRINTF(",");
DPRINTF("%02x", *cdb++);
if (i) TRACE(",");
TRACE("%02x", *cdb++);
}
DPRINTF("]\n");
TRACE("]\n");
}
}
......
dlls/winaspi/winaspi32.c
View file @ 2e24a148
......@@ -179,12 +179,12 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd *prb)
cdb = &prb->CDBByte[0];
cmd = prb->CDBByte[0];
if (TRACE_ON(aspi)) {
DPRINTF("CDB buffer[");
TRACE("CDB buffer[");
for (i = 0; i < prb->SRB_CDBLen; i++) {
if (i != 0) DPRINTF(",");
DPRINTF("%02x", *cdb++);
if (i != 0) TRACE(",");
TRACE("%02x", *cdb++);
}
DPRINTF("]\n");
TRACE("]\n");
}
}
......@@ -194,12 +194,12 @@ ASPI_PrintCDBArea(SRB_ExecSCSICmd *prb)
if (TRACE_ON(aspi))
{
int i;
DPRINTF("CDB[");
TRACE("CDB[");
for (i = 0; i < prb->SRB_CDBLen; i++) {
if (i) DPRINTF(",");
DPRINTF("%02x", prb->CDBByte[i]);
if (i) TRACE(",");
TRACE("%02x", prb->CDBByte[i]);
}
DPRINTF("]\n");
TRACE("]\n");
}
}
......@@ -211,32 +211,32 @@ ASPI_PrintSenseArea(SRB_ExecSCSICmd *prb)
if (TRACE_ON(aspi))
{
DPRINTF("Request Sense reports:\n");
TRACE("Request Sense reports:\n");
if ((rqbuf[0]&0x7f)!=0x70) {
DPRINTF("\tInvalid sense header: 0x%02x instead of 0x70\n", rqbuf[0]&0x7f);
TRACE("\tInvalid sense header: 0x%02x instead of 0x70\n", rqbuf[0]&0x7f);
return;
}
DPRINTF("\tCurrent command read filemark: %s\n",(rqbuf[2]&0x80)?"yes":"no");
DPRINTF("\tEarly warning passed: %s\n",(rqbuf[2]&0x40)?"yes":"no");
DPRINTF("\tIncorrect blocklength: %s\n",(rqbuf[2]&0x20)?"yes":"no");
DPRINTF("\tSense Key: %d\n",rqbuf[2]&0xf);
TRACE("\tCurrent command read filemark: %s\n",(rqbuf[2]&0x80)?"yes":"no");
TRACE("\tEarly warning passed: %s\n",(rqbuf[2]&0x40)?"yes":"no");
TRACE("\tIncorrect blocklength: %s\n",(rqbuf[2]&0x20)?"yes":"no");
TRACE("\tSense Key: %d\n",rqbuf[2]&0xf);
if (rqbuf[0]&0x80)
DPRINTF("\tResidual Length: %d\n",rqbuf[3]*0x1000000+rqbuf[4]*0x10000+rqbuf[5]*0x100+rqbuf[6]);
DPRINTF("\tAdditional Sense Length: %d\n",rqbuf[7]);
DPRINTF("\tAdditional Sense Code: %d\n",rqbuf[12]);
DPRINTF("\tAdditional Sense Code Qualifier: %d\n",rqbuf[13]);
TRACE("\tResidual Length: %d\n",rqbuf[3]*0x1000000+rqbuf[4]*0x10000+rqbuf[5]*0x100+rqbuf[6]);
TRACE("\tAdditional Sense Length: %d\n",rqbuf[7]);
TRACE("\tAdditional Sense Code: %d\n",rqbuf[12]);
TRACE("\tAdditional Sense Code Qualifier: %d\n",rqbuf[13]);
if (rqbuf[15]&0x80) {
DPRINTF("\tIllegal Param is in %s\n",(rqbuf[15]&0x40)?"the CDB":"the Data Out Phase");
TRACE("\tIllegal Param is in %s\n",(rqbuf[15]&0x40)?"the CDB":"the Data Out Phase");
if (rqbuf[15]&0x8) {
DPRINTF("Pointer at %d, bit %d\n",rqbuf[16]*256+rqbuf[17],rqbuf[15]&0x7);
TRACE("Pointer at %d, bit %d\n",rqbuf[16]*256+rqbuf[17],rqbuf[15]&0x7);
}
}
DPRINTF("SenseArea[");
TRACE("SenseArea[");
for (i = 0; i < prb->SRB_SenseLen; i++) {
if (i) DPRINTF(",");
DPRINTF("%02x", *rqbuf++);
if (i) TRACE(",");
TRACE("%02x", *rqbuf++);
}
DPRINTF("]\n");
TRACE("]\n");
}
}
......
dlls/x11drv/keyboard.c
View file @ 2e24a148
......@@ -1378,9 +1378,9 @@ void X11DRV_InitKeyboard( BYTE *key_state_table )
ksname = XKeysymToString(keysym);
if (!ksname)
ksname = "NoSymbol";
DPRINTF( "%lX (%s) ", keysym, ksname);
TRACE( "%lX (%s) ", keysym, ksname);
}
DPRINTF(")\n");
TRACE(")\n");
}
}
}
......
files/smb.c
View file @ 2e24a148
......@@ -934,8 +934,8 @@ static BOOL SMB_Open(int fd, USHORT tree_id, USHORT user_id, USHORT dialect,
TRACE("response, %d args: ",pcount);
for(i=0; i<pcount; i++)
DPRINTF("%04x ",SMB_PARAM(rx.buffer,i));
DPRINTF("\n");
TRACE("%04x ",SMB_PARAM(rx.buffer,i));
TRACE("\n");
*file_id = SMB_PARAM(rx.buffer,0);
......@@ -996,8 +996,8 @@ static BOOL SMB_Read(int fd, USHORT tree_id, USHORT user_id, USHORT dialect,
TRACE("response, %d args: ",n);
for(i=0; i<n; i++)
DPRINTF("%04x ",SMB_PARAM(rx.buffer,i));
DPRINTF("\n");
TRACE("%04x ",SMB_PARAM(rx.buffer,i));
TRACE("\n");
n = SMB_PARAM(rx.buffer,5) - 3;
if(n>count)
......
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