Replace DPRINTF with TRACE.
diff --git a/controls/listbox.c b/controls/listbox.c
index 1b625b5..fc72609 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -750,9 +750,9 @@
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? */
diff --git a/controls/scroll.c b/controls/scroll.c
index 4c8aef3..b86ea5f 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -1560,10 +1560,10 @@
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 */
diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c
index de0c010..ddd4984 100644
--- a/dlls/comcat/information.c
+++ b/dlls/comcat/information.c
@@ -200,10 +200,10 @@
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) ||
diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c
index 2995439..94a3c0c 100644
--- a/dlls/ddraw/d3ddevice/main.c
+++ b/dlls/ddraw/d3ddevice/main.c
@@ -968,9 +968,9 @@
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;
}
}
diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index da1cd34..7e19bc2 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -1171,12 +1171,12 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
} 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;
diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c
index 53ff2f2..4b34602 100644
--- a/dlls/ddraw/d3dexecutebuffer.c
+++ b/dlls/ddraw/d3dexecutebuffer.c
@@ -154,22 +154,22 @@
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 @@
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.
diff --git a/dlls/ddraw/d3dvertexbuffer.c b/dlls/ddraw/d3dvertexbuffer.c
index 9a06664..3052d34 100644
--- a/dlls/ddraw/d3dvertexbuffer.c
+++ b/dlls/ddraw/d3dvertexbuffer.c
@@ -365,12 +365,12 @@
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 @@
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 @@
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 @@
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 @@
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;
diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c
index cb81c15..928870e 100644
--- a/dlls/ddraw/ddraw/main.c
+++ b/dlls/ddraw/ddraw/main.c
@@ -543,7 +543,7 @@
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 @@
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 @@
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 */
diff --git a/dlls/ddraw/dsurface/main.c b/dlls/ddraw/dsurface/main.c
index 78dfaf7..1693d6d 100644
--- a/dlls/ddraw/dsurface/main.c
+++ b/dlls/ddraw/dsurface/main.c
@@ -625,7 +625,7 @@
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 @@
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 @@
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))
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 5e41e3b..d621d0e 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -65,14 +65,14 @@
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++)
diff --git a/dlls/dinput/joystick/linux.c b/dlls/dinput/joystick/linux.c
index 46ea8dc..bbc45a4 100644
--- a/dlls/dinput/joystick/linux.c
+++ b/dlls/dinput/joystick/linux.c
@@ -447,9 +447,9 @@
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 */
diff --git a/dlls/dinput/joystick/linuxinput.c b/dlls/dinput/joystick/linuxinput.c
index 679709f..ba09bf1 100644
--- a/dlls/dinput/joystick/linuxinput.c
+++ b/dlls/dinput/joystick/linuxinput.c
@@ -676,9 +676,9 @@
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;
diff --git a/dlls/dinput/keyboard/main.c b/dlls/dinput/keyboard/main.c
index 2cad814..8c316de 100644
--- a/dlls/dinput/keyboard/main.c
+++ b/dlls/dinput/keyboard/main.c
@@ -355,9 +355,9 @@
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 */
diff --git a/dlls/dinput/mouse/main.c b/dlls/dinput/mouse/main.c
index f9643c1..2450cba 100644
--- a/dlls/dinput/mouse/main.c
+++ b/dlls/dinput/mouse/main.c
@@ -868,9 +868,9 @@
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 */
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index c0e4990..a762ca4 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -600,10 +600,10 @@
{
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;
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index 572428d..38bdaa1 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -45,7 +45,7 @@
HANDLE RICHED32_hHeap = NULL;
/* LPSTR RICHED32_aSubclass = NULL; */
-#define DPRINTF_EDIT_MSG32(str) \
+#define TRACE_EDIT_MSG32(str) \
TRACE(\
"32 bit : " str ": hwnd=%p, wParam=%08x, lParam=%08x\n"\
, \
@@ -119,12 +119,12 @@
{
case WM_CREATE:
- DPRINTF_EDIT_MSG32("WM_CREATE Passed to default");
+ TRACE_EDIT_MSG32("WM_CREATE Passed to default");
DefWindowProcA( hwnd,uMsg,wParam,lParam);
return 0 ;
case WM_NCCREATE :
- DPRINTF_EDIT_MSG32("WM_NCCREATE");
+ TRACE_EDIT_MSG32("WM_NCCREATE");
/* remove SCROLLBARS from the current window style */
hwndParent = ((LPCREATESTRUCTA) lParam)->hwndParent;
@@ -149,17 +149,17 @@
return FALSE ;
case WM_SETFOCUS :
- DPRINTF_EDIT_MSG32("WM_SETFOCUS");
+ TRACE_EDIT_MSG32("WM_SETFOCUS");
SetFocus (hwndEdit) ;
return 0 ;
case WM_SIZE :
- DPRINTF_EDIT_MSG32("WM_SIZE");
+ TRACE_EDIT_MSG32("WM_SIZE");
MoveWindow (hwndEdit, 0, 0, LOWORD (lParam), HIWORD (lParam), TRUE) ;
return 0 ;
case WM_COMMAND :
- DPRINTF_EDIT_MSG32("WM_COMMAND");
+ TRACE_EDIT_MSG32("WM_COMMAND");
switch(HIWORD(wParam)) {
case EN_CHANGE:
case EN_HSCROLL:
@@ -178,7 +178,7 @@
}
case EM_STREAMIN:
- DPRINTF_EDIT_MSG32("EM_STREAMIN");
+ TRACE_EDIT_MSG32("EM_STREAMIN");
/* setup the RTF parser */
RTFSetEditStream(( EDITSTREAM*)lParam);
@@ -206,23 +206,23 @@
/* Messages specific to Richedit controls */
case EM_AUTOURLDETECT:
- DPRINTF_EDIT_MSG32("EM_AUTOURLDETECT Ignored");
+ TRACE_EDIT_MSG32("EM_AUTOURLDETECT Ignored");
return 0;
case EM_CANPASTE:
- DPRINTF_EDIT_MSG32("EM_CANPASTE Ignored");
+ TRACE_EDIT_MSG32("EM_CANPASTE Ignored");
return 0;
case EM_CANREDO:
- DPRINTF_EDIT_MSG32("EM_CANREDO Ignored");
+ TRACE_EDIT_MSG32("EM_CANREDO Ignored");
return 0;
case EM_DISPLAYBAND:
- DPRINTF_EDIT_MSG32("EM_DISPLAYBAND Ignored");
+ TRACE_EDIT_MSG32("EM_DISPLAYBAND Ignored");
return 0;
case EM_EXGETSEL:
- DPRINTF_EDIT_MSG32("EM_EXGETSEL -> EM_GETSEL");
+ TRACE_EDIT_MSG32("EM_EXGETSEL -> EM_GETSEL");
cr = (VOID *) lParam;
if (hwndEdit) SendMessageA( hwndEdit, EM_GETSEL, (INT)&cr->cpMin, (INT)&cr->cpMax);
TRACE("cpMin: 0x%x cpMax: 0x%x\n",(INT)cr->cpMin,(INT)cr->cpMax);
@@ -231,7 +231,7 @@
case EM_EXLIMITTEXT:
{
DWORD limit = lParam;
- DPRINTF_EDIT_MSG32("EM_EXLIMITTEXT");
+ TRACE_EDIT_MSG32("EM_EXLIMITTEXT");
if (limit > 65534)
{
limit = 0xFFFFFFFF;
@@ -240,403 +240,403 @@
}
case EM_EXLINEFROMCHAR:
- DPRINTF_EDIT_MSG32("EM_EXLINEFROMCHAR -> LINEFROMCHAR");
+ TRACE_EDIT_MSG32("EM_EXLINEFROMCHAR -> LINEFROMCHAR");
if (hwndEdit) return SendMessageA( hwndEdit, EM_LINEFROMCHAR, lParam, wParam);
return 0;
case EM_EXSETSEL:
- DPRINTF_EDIT_MSG32("EM_EXSETSEL -> EM_SETSEL");
+ TRACE_EDIT_MSG32("EM_EXSETSEL -> EM_SETSEL");
cr = (VOID *) lParam;
if (hwndEdit) SendMessageA( hwndEdit, EM_SETSEL, cr->cpMin, cr->cpMax);
return 0;
case EM_FINDTEXT:
- DPRINTF_EDIT_MSG32("EM_FINDTEXT Ignored");
+ TRACE_EDIT_MSG32("EM_FINDTEXT Ignored");
return 0;
case EM_FINDTEXTEX:
- DPRINTF_EDIT_MSG32("EM_FINDTEXTEX Ignored");
+ TRACE_EDIT_MSG32("EM_FINDTEXTEX Ignored");
return 0;
case EM_FINDTEXTEXW:
- DPRINTF_EDIT_MSG32("EM_FINDTEXTEXW Ignored");
+ TRACE_EDIT_MSG32("EM_FINDTEXTEXW Ignored");
return 0;
case EM_FINDTEXTW:
- DPRINTF_EDIT_MSG32("EM_FINDTEXTW Ignored");
+ TRACE_EDIT_MSG32("EM_FINDTEXTW Ignored");
return 0;
case EM_FINDWORDBREAK:
- DPRINTF_EDIT_MSG32("EM_FINDWORDBREAK Ignored");
+ TRACE_EDIT_MSG32("EM_FINDWORDBREAK Ignored");
return 0;
case EM_FORMATRANGE:
- DPRINTF_EDIT_MSG32("EM_FORMATRANGE Ignored");
+ TRACE_EDIT_MSG32("EM_FORMATRANGE Ignored");
return 0;
case EM_GETAUTOURLDETECT:
- DPRINTF_EDIT_MSG32("EM_GETAUTOURLDETECT Ignored");
+ TRACE_EDIT_MSG32("EM_GETAUTOURLDETECT Ignored");
return 0;
case EM_GETBIDIOPTIONS:
- DPRINTF_EDIT_MSG32("EM_GETBIDIOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_GETBIDIOPTIONS Ignored");
return 0;
case EM_GETCHARFORMAT:
- DPRINTF_EDIT_MSG32("EM_GETCHARFORMAT Ignored");
+ TRACE_EDIT_MSG32("EM_GETCHARFORMAT Ignored");
return 0;
case EM_GETEDITSTYLE:
- DPRINTF_EDIT_MSG32("EM_GETEDITSTYLE Ignored");
+ TRACE_EDIT_MSG32("EM_GETEDITSTYLE Ignored");
return 0;
case EM_GETEVENTMASK:
- DPRINTF_EDIT_MSG32("EM_GETEVENTMASK Ignored");
+ TRACE_EDIT_MSG32("EM_GETEVENTMASK Ignored");
return 0;
case EM_GETIMECOLOR:
- DPRINTF_EDIT_MSG32("EM_GETIMECOLOR Ignored");
+ TRACE_EDIT_MSG32("EM_GETIMECOLOR Ignored");
return 0;
case EM_GETIMECOMPMODE:
- DPRINTF_EDIT_MSG32("EM_GETIMECOMPMODE Ignored");
+ TRACE_EDIT_MSG32("EM_GETIMECOMPMODE Ignored");
return 0;
case EM_GETIMEOPTIONS:
- DPRINTF_EDIT_MSG32("EM_GETIMEOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_GETIMEOPTIONS Ignored");
return 0;
case EM_GETLANGOPTIONS:
- DPRINTF_EDIT_MSG32("STUB: EM_GETLANGOPTIONS");
+ TRACE_EDIT_MSG32("STUB: EM_GETLANGOPTIONS");
return 0;
case EM_GETOLEINTERFACE:
- DPRINTF_EDIT_MSG32("EM_GETOLEINTERFACE Ignored");
+ TRACE_EDIT_MSG32("EM_GETOLEINTERFACE Ignored");
return 0;
case EM_GETOPTIONS:
- DPRINTF_EDIT_MSG32("EM_GETOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_GETOPTIONS Ignored");
return 0;
case EM_GETPARAFORMAT:
- DPRINTF_EDIT_MSG32("EM_GETPARAFORMAT Ignored");
+ TRACE_EDIT_MSG32("EM_GETPARAFORMAT Ignored");
return 0;
case EM_GETPUNCTUATION:
- DPRINTF_EDIT_MSG32("EM_GETPUNCTUATION Ignored");
+ TRACE_EDIT_MSG32("EM_GETPUNCTUATION Ignored");
return 0;
case EM_GETREDONAME:
- DPRINTF_EDIT_MSG32("EM_GETREDONAME Ignored");
+ TRACE_EDIT_MSG32("EM_GETREDONAME Ignored");
return 0;
case EM_GETSCROLLPOS:
- DPRINTF_EDIT_MSG32("EM_GETSCROLLPOS Ignored");
+ TRACE_EDIT_MSG32("EM_GETSCROLLPOS Ignored");
return 0;
case EM_GETSELTEXT:
- DPRINTF_EDIT_MSG32("EM_GETSELTEXT");
+ TRACE_EDIT_MSG32("EM_GETSELTEXT");
return RICHEDIT_GetSelText(hwndEdit,(void *)lParam);
case EM_GETTEXTEX:
- DPRINTF_EDIT_MSG32("EM_GETTEXTEX Ignored");
+ TRACE_EDIT_MSG32("EM_GETTEXTEX Ignored");
return 0;
case EM_GETTEXTLENGTHEX:
- DPRINTF_EDIT_MSG32("EM_GETTEXTLENGTHEX Ignored");
+ TRACE_EDIT_MSG32("EM_GETTEXTLENGTHEX Ignored");
return 0;
case EM_GETTEXTMODE:
- DPRINTF_EDIT_MSG32("EM_GETTEXTMODE Ignored");
+ TRACE_EDIT_MSG32("EM_GETTEXTMODE Ignored");
return 0;
case EM_GETTEXTRANGE:
- DPRINTF_EDIT_MSG32("EM_GETTEXTRANGE");
+ TRACE_EDIT_MSG32("EM_GETTEXTRANGE");
return RICHEDIT_GetTextRange(hwndEdit,(TEXTRANGEA *)lParam);
case EM_GETTYPOGRAPHYOPTIONS:
- DPRINTF_EDIT_MSG32("EM_GETTYPOGRAPHYOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_GETTYPOGRAPHYOPTIONS Ignored");
return 0;
case EM_GETUNDONAME:
- DPRINTF_EDIT_MSG32("EM_GETUNDONAME Ignored");
+ TRACE_EDIT_MSG32("EM_GETUNDONAME Ignored");
return 0;
case EM_GETWORDBREAKPROCEX:
- DPRINTF_EDIT_MSG32("EM_GETWORDBREAKPROCEX Ignored");
+ TRACE_EDIT_MSG32("EM_GETWORDBREAKPROCEX Ignored");
return 0;
case EM_GETWORDWRAPMODE:
- DPRINTF_EDIT_MSG32("EM_GETWORDWRAPMODE Ignored");
+ TRACE_EDIT_MSG32("EM_GETWORDWRAPMODE Ignored");
return 0;
case EM_GETZOOM:
- DPRINTF_EDIT_MSG32("EM_GETZOOM Ignored");
+ TRACE_EDIT_MSG32("EM_GETZOOM Ignored");
return 0;
case EM_HIDESELECTION:
- DPRINTF_EDIT_MSG32("EM_HIDESELECTION Ignored");
+ TRACE_EDIT_MSG32("EM_HIDESELECTION Ignored");
return 0;
case EM_PASTESPECIAL:
- DPRINTF_EDIT_MSG32("EM_PASTESPECIAL Ignored");
+ TRACE_EDIT_MSG32("EM_PASTESPECIAL Ignored");
return 0;
case EM_RECONVERSION:
- DPRINTF_EDIT_MSG32("EM_RECONVERSION Ignored");
+ TRACE_EDIT_MSG32("EM_RECONVERSION Ignored");
return 0;
case EM_REDO:
- DPRINTF_EDIT_MSG32("EM_REDO Ignored");
+ TRACE_EDIT_MSG32("EM_REDO Ignored");
return 0;
case EM_REQUESTRESIZE:
- DPRINTF_EDIT_MSG32("EM_REQUESTRESIZE Ignored");
+ TRACE_EDIT_MSG32("EM_REQUESTRESIZE Ignored");
return 0;
case EM_SELECTIONTYPE:
- DPRINTF_EDIT_MSG32("EM_SELECTIONTYPE Ignored");
+ TRACE_EDIT_MSG32("EM_SELECTIONTYPE Ignored");
return 0;
case EM_SETBIDIOPTIONS:
- DPRINTF_EDIT_MSG32("EM_SETBIDIOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_SETBIDIOPTIONS Ignored");
return 0;
case EM_SETBKGNDCOLOR:
- DPRINTF_EDIT_MSG32("EM_SETBKGNDCOLOR Ignored");
+ TRACE_EDIT_MSG32("EM_SETBKGNDCOLOR Ignored");
return 0;
case EM_SETCHARFORMAT:
- DPRINTF_EDIT_MSG32("EM_SETCHARFORMAT Ignored");
+ TRACE_EDIT_MSG32("EM_SETCHARFORMAT Ignored");
return 0;
case EM_SETEDITSTYLE:
- DPRINTF_EDIT_MSG32("EM_SETEDITSTYLE Ignored");
+ TRACE_EDIT_MSG32("EM_SETEDITSTYLE Ignored");
return 0;
case EM_SETEVENTMASK:
- DPRINTF_EDIT_MSG32("EM_SETEVENTMASK Ignored");
+ TRACE_EDIT_MSG32("EM_SETEVENTMASK Ignored");
return 0;
case EM_SETFONTSIZE:
- DPRINTF_EDIT_MSG32("EM_SETFONTSIZE Ignored");
+ TRACE_EDIT_MSG32("EM_SETFONTSIZE Ignored");
return 0;
case EM_SETIMECOLOR:
- DPRINTF_EDIT_MSG32("EM_SETIMECOLO Ignored");
+ TRACE_EDIT_MSG32("EM_SETIMECOLO Ignored");
return 0;
case EM_SETIMEOPTIONS:
- DPRINTF_EDIT_MSG32("EM_SETIMEOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_SETIMEOPTIONS Ignored");
return 0;
case EM_SETLANGOPTIONS:
- DPRINTF_EDIT_MSG32("EM_SETLANGOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_SETLANGOPTIONS Ignored");
return 0;
case EM_SETOLECALLBACK:
- DPRINTF_EDIT_MSG32("EM_SETOLECALLBACK Ignored");
+ TRACE_EDIT_MSG32("EM_SETOLECALLBACK Ignored");
return 0;
case EM_SETOPTIONS:
- DPRINTF_EDIT_MSG32("EM_SETOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_SETOPTIONS Ignored");
return 0;
case EM_SETPALETTE:
- DPRINTF_EDIT_MSG32("EM_SETPALETTE Ignored");
+ TRACE_EDIT_MSG32("EM_SETPALETTE Ignored");
return 0;
case EM_SETPARAFORMAT:
- DPRINTF_EDIT_MSG32("EM_SETPARAFORMAT Ignored");
+ TRACE_EDIT_MSG32("EM_SETPARAFORMAT Ignored");
return 0;
case EM_SETPUNCTUATION:
- DPRINTF_EDIT_MSG32("EM_SETPUNCTUATION Ignored");
+ TRACE_EDIT_MSG32("EM_SETPUNCTUATION Ignored");
return 0;
case EM_SETSCROLLPOS:
- DPRINTF_EDIT_MSG32("EM_SETSCROLLPOS Ignored");
+ TRACE_EDIT_MSG32("EM_SETSCROLLPOS Ignored");
return 0;
case EM_SETTARGETDEVICE:
- DPRINTF_EDIT_MSG32("EM_SETTARGETDEVICE Ignored");
+ TRACE_EDIT_MSG32("EM_SETTARGETDEVICE Ignored");
return 0;
case EM_SETTEXTEX:
- DPRINTF_EDIT_MSG32("EM_SETTEXTEX Ignored");
+ TRACE_EDIT_MSG32("EM_SETTEXTEX Ignored");
return 0;
case EM_SETTEXTMODE:
- DPRINTF_EDIT_MSG32("EM_SETTEXTMODE Ignored");
+ TRACE_EDIT_MSG32("EM_SETTEXTMODE Ignored");
return 0;
case EM_SETTYPOGRAPHYOPTIONS:
- DPRINTF_EDIT_MSG32("EM_SETTYPOGRAPHYOPTIONS Ignored");
+ TRACE_EDIT_MSG32("EM_SETTYPOGRAPHYOPTIONS Ignored");
return 0;
case EM_SETUNDOLIMIT:
- DPRINTF_EDIT_MSG32("EM_SETUNDOLIMIT Ignored");
+ TRACE_EDIT_MSG32("EM_SETUNDOLIMIT Ignored");
return 0;
case EM_SETWORDBREAKPROCEX:
- DPRINTF_EDIT_MSG32("EM_SETWORDBREAKPROCEX Ignored");
+ TRACE_EDIT_MSG32("EM_SETWORDBREAKPROCEX Ignored");
return 0;
case EM_SETWORDWRAPMODE:
- DPRINTF_EDIT_MSG32("EM_SETWORDWRAPMODE Ignored");
+ TRACE_EDIT_MSG32("EM_SETWORDWRAPMODE Ignored");
return 0;
case EM_SETZOOM:
- DPRINTF_EDIT_MSG32("EM_SETZOOM Ignored");
+ TRACE_EDIT_MSG32("EM_SETZOOM Ignored");
return 0;
case EM_SHOWSCROLLBAR:
- DPRINTF_EDIT_MSG32("EM_SHOWSCROLLBAR Ignored");
+ TRACE_EDIT_MSG32("EM_SHOWSCROLLBAR Ignored");
return 0;
case EM_STOPGROUPTYPING:
- DPRINTF_EDIT_MSG32("EM_STOPGROUPTYPING Ignored");
+ TRACE_EDIT_MSG32("EM_STOPGROUPTYPING Ignored");
return 0;
case EM_STREAMOUT:
- DPRINTF_EDIT_MSG32("EM_STREAMOUT Ignored");
+ TRACE_EDIT_MSG32("EM_STREAMOUT Ignored");
return 0;
/* Messages dispatched to the edit control */
case EM_CANUNDO:
- DPRINTF_EDIT_MSG32("EM_CANUNDO Passed to edit control");
+ TRACE_EDIT_MSG32("EM_CANUNDO Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_CHARFROMPOS:
- DPRINTF_EDIT_MSG32("EM_CHARFROMPOS Passed to edit control");
+ TRACE_EDIT_MSG32("EM_CHARFROMPOS Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_EMPTYUNDOBUFFER:
- DPRINTF_EDIT_MSG32("EM_EMPTYUNDOBUFFER Passed to edit control");
+ TRACE_EDIT_MSG32("EM_EMPTYUNDOBUFFER Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_FMTLINES:
- DPRINTF_EDIT_MSG32("EM_FMTLINES Passed to edit control");
+ TRACE_EDIT_MSG32("EM_FMTLINES Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETFIRSTVISIBLELINE:
- DPRINTF_EDIT_MSG32("EM_GETFIRSTVISIBLELINE Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETFIRSTVISIBLELINE Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETHANDLE:
- DPRINTF_EDIT_MSG32("EM_GETHANDLE Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETHANDLE Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
/* case EM_GETIMESTATUS:*/
case EM_GETLIMITTEXT:
- DPRINTF_EDIT_MSG32("EM_GETLIMITTEXT Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETLIMITTEXT Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETLINE:
- DPRINTF_EDIT_MSG32("EM_GETLINE Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETLINE Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETLINECOUNT:
- DPRINTF_EDIT_MSG32("EM_GETLINECOUNT Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETLINECOUNT Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETMARGINS:
- DPRINTF_EDIT_MSG32("EM_GETMARGINS Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETMARGINS Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETMODIFY:
- DPRINTF_EDIT_MSG32("EM_GETMODIFY Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETMODIFY Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETPASSWORDCHAR:
- DPRINTF_EDIT_MSG32("EM_GETPASSWORDCHAR Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETPASSWORDCHAR Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETRECT:
- DPRINTF_EDIT_MSG32("EM_GETRECT Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETRECT Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETSEL:
- DPRINTF_EDIT_MSG32("EM_GETSEL Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETSEL Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETTHUMB:
- DPRINTF_EDIT_MSG32("EM_GETTHUMB Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETTHUMB Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_GETWORDBREAKPROC:
- DPRINTF_EDIT_MSG32("EM_GETWORDBREAKPROC Passed to edit control");
+ TRACE_EDIT_MSG32("EM_GETWORDBREAKPROC Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_LINEFROMCHAR:
- DPRINTF_EDIT_MSG32("EM_LINEFROMCHAR Passed to edit control");
+ TRACE_EDIT_MSG32("EM_LINEFROMCHAR Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_LINEINDEX:
- DPRINTF_EDIT_MSG32("EM_LINEINDEX Passed to edit control");
+ TRACE_EDIT_MSG32("EM_LINEINDEX Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_LINELENGTH:
- DPRINTF_EDIT_MSG32("EM_LINELENGTH Passed to edit control");
+ TRACE_EDIT_MSG32("EM_LINELENGTH Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_LINESCROLL:
- DPRINTF_EDIT_MSG32("EM_LINESCROLL Passed to edit control");
+ TRACE_EDIT_MSG32("EM_LINESCROLL Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_POSFROMCHAR:
- DPRINTF_EDIT_MSG32("EM_POSFROMCHAR Passed to edit control");
+ TRACE_EDIT_MSG32("EM_POSFROMCHAR Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_REPLACESEL:
- DPRINTF_EDIT_MSG32("case EM_REPLACESEL Passed to edit control");
+ TRACE_EDIT_MSG32("case EM_REPLACESEL Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SCROLL:
- DPRINTF_EDIT_MSG32("case EM_SCROLL Passed to edit control");
+ TRACE_EDIT_MSG32("case EM_SCROLL Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SCROLLCARET:
- DPRINTF_EDIT_MSG32("EM_SCROLLCARET Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SCROLLCARET Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETHANDLE:
- DPRINTF_EDIT_MSG32("EM_SETHANDLE Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETHANDLE Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
/* case EM_SETIMESTATUS:*/
case EM_SETLIMITTEXT:
- DPRINTF_EDIT_MSG32("EM_SETLIMITTEXT Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETLIMITTEXT Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETMARGINS:
- DPRINTF_EDIT_MSG32("case EM_SETMARGINS Passed to edit control");
+ TRACE_EDIT_MSG32("case EM_SETMARGINS Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETMODIFY:
- DPRINTF_EDIT_MSG32("EM_SETMODIFY Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETMODIFY Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETPASSWORDCHAR:
- DPRINTF_EDIT_MSG32("EM_SETPASSWORDCHAR Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETPASSWORDCHAR Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETREADONLY:
- DPRINTF_EDIT_MSG32("EM_SETREADONLY Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETREADONLY Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETRECT:
- DPRINTF_EDIT_MSG32("EM_SETRECT Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETRECT Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETRECTNP:
- DPRINTF_EDIT_MSG32("EM_SETRECTNP Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETRECTNP Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETSEL:
- DPRINTF_EDIT_MSG32("EM_SETSEL Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETSEL Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETTABSTOPS:
- DPRINTF_EDIT_MSG32("EM_SETTABSTOPS Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETTABSTOPS Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_SETWORDBREAKPROC:
- DPRINTF_EDIT_MSG32("EM_SETWORDBREAKPROC Passed to edit control");
+ TRACE_EDIT_MSG32("EM_SETWORDBREAKPROC Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case EM_UNDO:
- DPRINTF_EDIT_MSG32("EM_UNDO Passed to edit control");
+ TRACE_EDIT_MSG32("EM_UNDO Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case WM_STYLECHANGING:
- DPRINTF_EDIT_MSG32("WM_STYLECHANGING Passed to edit control");
+ TRACE_EDIT_MSG32("WM_STYLECHANGING Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case WM_STYLECHANGED:
- DPRINTF_EDIT_MSG32("WM_STYLECHANGED Passed to edit control");
+ TRACE_EDIT_MSG32("WM_STYLECHANGED Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case WM_GETTEXT:
- DPRINTF_EDIT_MSG32("WM_GETTEXT Passed to edit control");
+ TRACE_EDIT_MSG32("WM_GETTEXT Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case WM_GETTEXTLENGTH:
- DPRINTF_EDIT_MSG32("WM_GETTEXTLENGTH Passed to edit control");
+ TRACE_EDIT_MSG32("WM_GETTEXTLENGTH Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case WM_SETTEXT:
- DPRINTF_EDIT_MSG32("WM_SETTEXT Passed to edit control");
+ TRACE_EDIT_MSG32("WM_SETTEXT Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case WM_CUT:
- DPRINTF_EDIT_MSG32("WM_CUT Passed to edit control");
+ TRACE_EDIT_MSG32("WM_CUT Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case WM_COPY:
- DPRINTF_EDIT_MSG32("WM_COPY Passed to edit control");
+ TRACE_EDIT_MSG32("WM_COPY Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
case WM_PASTE:
- DPRINTF_EDIT_MSG32("WM_PASTE Passed to edit control");
+ TRACE_EDIT_MSG32("WM_PASTE Passed to edit control");
return SendMessageA( hwndEdit, uMsg, wParam, lParam);
/* Messages passed to default handler. */
@@ -660,80 +660,80 @@
WM_SIZE message above. Since it is very unlikely that an app would call
and use the WM_NCCALCSIZE message, we stick with the easy fix for now.
*/
- DPRINTF_EDIT_MSG32("WM_NCCALCSIZE Passed to default");
+ TRACE_EDIT_MSG32("WM_NCCALCSIZE Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_NCPAINT:
- DPRINTF_EDIT_MSG32("WM_NCPAINT Passed to default");
+ TRACE_EDIT_MSG32("WM_NCPAINT Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_PAINT:
- DPRINTF_EDIT_MSG32("WM_PAINT Passed to default");
+ TRACE_EDIT_MSG32("WM_PAINT Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_ERASEBKGND:
- DPRINTF_EDIT_MSG32("WM_ERASEBKGND Passed to default");
+ TRACE_EDIT_MSG32("WM_ERASEBKGND Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_KILLFOCUS:
- DPRINTF_EDIT_MSG32("WM_KILLFOCUS Passed to default");
+ TRACE_EDIT_MSG32("WM_KILLFOCUS Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_DESTROY:
- DPRINTF_EDIT_MSG32("WM_DESTROY Passed to default");
+ TRACE_EDIT_MSG32("WM_DESTROY Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_CHILDACTIVATE:
- DPRINTF_EDIT_MSG32("WM_CHILDACTIVATE Passed to default");
+ TRACE_EDIT_MSG32("WM_CHILDACTIVATE Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_WINDOWPOSCHANGING:
- DPRINTF_EDIT_MSG32("WM_WINDOWPOSCHANGING Passed to default");
+ TRACE_EDIT_MSG32("WM_WINDOWPOSCHANGING Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_WINDOWPOSCHANGED:
- DPRINTF_EDIT_MSG32("WM_WINDOWPOSCHANGED Passed to default");
+ TRACE_EDIT_MSG32("WM_WINDOWPOSCHANGED Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
/* case WM_INITIALUPDATE:
- DPRINTF_EDIT_MSG32("WM_INITIALUPDATE Passed to default");
+ TRACE_EDIT_MSG32("WM_INITIALUPDATE Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam); */
case WM_CTLCOLOREDIT:
- DPRINTF_EDIT_MSG32("WM_CTLCOLOREDIT Passed to default");
+ TRACE_EDIT_MSG32("WM_CTLCOLOREDIT Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_SETCURSOR:
- DPRINTF_EDIT_MSG32("WM_SETCURSOR Passed to default");
+ TRACE_EDIT_MSG32("WM_SETCURSOR Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_MOVE:
- DPRINTF_EDIT_MSG32("WM_MOVE Passed to default");
+ TRACE_EDIT_MSG32("WM_MOVE Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_SHOWWINDOW:
- DPRINTF_EDIT_MSG32("WM_SHOWWINDOW Passed to default");
+ TRACE_EDIT_MSG32("WM_SHOWWINDOW Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_PARENTNOTIFY:
- DPRINTF_EDIT_MSG32("WM_PARENTNOTIFY Passed to default");
+ TRACE_EDIT_MSG32("WM_PARENTNOTIFY Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_SETREDRAW:
- DPRINTF_EDIT_MSG32("WM_SETREDRAW Passed to default");
+ TRACE_EDIT_MSG32("WM_SETREDRAW Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_NCDESTROY:
- DPRINTF_EDIT_MSG32("WM_NCDESTROY Passed to default");
+ TRACE_EDIT_MSG32("WM_NCDESTROY Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_NCHITTEST:
- DPRINTF_EDIT_MSG32("WM_NCHITTEST Passed to default");
+ TRACE_EDIT_MSG32("WM_NCHITTEST Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_CTLCOLORSTATIC:
- DPRINTF_EDIT_MSG32("WM_CTLCOLORSTATIC Passed to default");
+ TRACE_EDIT_MSG32("WM_CTLCOLORSTATIC Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_NCMOUSEMOVE:
- DPRINTF_EDIT_MSG32("WM_NCMOUSEMOVE Passed to default");
+ TRACE_EDIT_MSG32("WM_NCMOUSEMOVE Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_CLEAR:
- DPRINTF_EDIT_MSG32("WM_CLEAR Passed to default");
+ TRACE_EDIT_MSG32("WM_CLEAR Passed to default");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
/*
* used by IE in the EULA box
*/
case WM_ALTTABACTIVE:
- DPRINTF_EDIT_MSG32("WM_ALTTABACTIVE");
+ TRACE_EDIT_MSG32("WM_ALTTABACTIVE");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_GETDLGCODE:
- DPRINTF_EDIT_MSG32("WM_GETDLGCODE");
+ TRACE_EDIT_MSG32("WM_GETDLGCODE");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
case WM_SETFONT:
- DPRINTF_EDIT_MSG32("WM_SETFONT");
+ TRACE_EDIT_MSG32("WM_SETFONT");
return DefWindowProcA( hwnd,uMsg,wParam,lParam);
}
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index 0123bd3..22397ad 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -1680,8 +1680,8 @@
{
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;
}
diff --git a/dlls/version/info.c b/dlls/version/info.c
index 2b4fbfd..b8289d5 100644
--- a/dlls/version/info.c
+++ b/dlls/version/info.c
@@ -59,28 +59,28 @@
);
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 @@
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 @@
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);
}
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index dac2824..200748d 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -184,12 +184,12 @@
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 @@
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");
}
}
diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c
index 3851604..9d311bb 100644
--- a/dlls/winaspi/winaspi32.c
+++ b/dlls/winaspi/winaspi32.c
@@ -179,12 +179,12 @@
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 @@
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 @@
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");
}
}
diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c
index 9cd84bc..2dd14ff 100644
--- a/dlls/x11drv/keyboard.c
+++ b/dlls/x11drv/keyboard.c
@@ -1378,9 +1378,9 @@
ksname = XKeysymToString(keysym);
if (!ksname)
ksname = "NoSymbol";
- DPRINTF( "%lX (%s) ", keysym, ksname);
+ TRACE( "%lX (%s) ", keysym, ksname);
}
- DPRINTF(")\n");
+ TRACE(")\n");
}
}
}
diff --git a/files/smb.c b/files/smb.c
index 21c711d..866650d 100644
--- a/files/smb.c
+++ b/files/smb.c
@@ -934,8 +934,8 @@
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 @@
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)
