DPRINTF->TRACE Final (Exceptions - not changed)
This completes the first stage of DPRINTF->TRACE. There are still a lot of files that use DPRINTF. The following is a list of the files I where I did not replace DPRINTF with TRACE along with a breif explanation. I would appreciate any comments on this or any of the patches that I submitted over the last day. windows/dce.c................ dump function. windows/winproc.............. dump function. scheduler/process.c.......... relay function. scheduler/tread.c............ relay function. relay32/relay386.c........... relay function. relay32/snoop.c.............. snoop function. programs/wineconsole ........ uses WINE_DPRINTF. msdos/vxd.c.................. dump function. misc/version.c............... should this be a FIXME? memory/global.c.............. dump function. memory/instr.c............... dump function. memory/local.c............... dump function. loader/pe_image.c............ dump function. loader/ne/module.c........... dump function. if1632/relay.c............... relay function. if1632/snoop.c............... snoop function. graphics/x11drv/opengl.c .... dump function. files/smb.c.................. dump functions (patch submitted) review. dlls/wineclipsrv.c........... define macros. dlls/winsock/socket.c........ dump function. dlls/winedos/dosvm.c......... relay function. dlls/winaspi/winaspi16.c .... dump function. dlls/winaspi/winaspi32.c..... dump function. dlls/user/hook.c............. relay function. dlls/opengl32/wgl.c.......... dump function (review). dlls/ole32/compobj.c......... dunp function. dlls/ole32/compositemoniker.c review (no /n to complete). dlls/ole32/storage.c......... dump function. dlls/ntdll/heap.c............ dump function. dlls/ntdll/virtual.c......... dump function. dlls/msvcrt/cppexcept.c...... dump function. dlls/kernel/thunk.c.......... thunk. dlls/kernel/wowthunk.c....... thunk. dlls/dsound/buffer.c......... this should be a fixme/message review. dlls/dsound/dsound_main.c.... dump function needs review. dlls/dsound/primary.c........ this should be a fixme/message review. dlls/dinput/device.c......... dump function dlls/ddraw/d3dcommon.c....... dump functions dlls/ddraw/d3dexecutebuffer.c patch submitted, dump function review. dlls/ddraw/d3dlight.c........ dump function dlls/ddraw/d3dmaterial.c..... dump functions dlls/ddraw/d3dhelper.c....... dump functions dlls/d3d8/device.c........... perhaps this should be a FIXME dlls/d3d8/shader.c........... frankly I don't want to touch it.<g> controls/menu.c.............. ditto. -- Tony Lambregts
Eric Pouech wrote:
programs/wineconsole ........ uses WINE_DPRINTF.
this can safely be replaced by multiple WINE_TRACE calls A+
Change Log: Convert WINE_DPRINTF calls to WINE_TRACE Files Changed: programs/wineconsole/wineconsole.c -- Tony Lambregts Index: wineconsole.c =================================================================== RCS file: /home/wine/wine/programs/wineconsole/wineconsole.c,v retrieving revision 1.24 diff -u -r1.24 wineconsole.c --- wineconsole.c 10 Mar 2003 19:03:33 -0000 1.24 +++ wineconsole.c 15 Mar 2003 16:10:42 -0000 @@ -278,7 +278,7 @@ } SERVER_END_REQ; if (WINE_TRACE_ON(wineconsole)) - WINE_DPRINTF(" active(%d)", (int)h); + WINE_TRACE(" active(%d)", (int)h); if (h) { CloseHandle(data->hConOut); @@ -290,7 +290,7 @@ data->curcfg.sb_height != evts[i].u.resize.height || !data->cells) { if (WINE_TRACE_ON(wineconsole)) - WINE_DPRINTF(" resize(%d,%d)", evts[i].u.resize.width, evts[i].u.resize.height); + WINE_TRACE(" resize(%d,%d)", evts[i].u.resize.width, evts[i].u.resize.height); data->curcfg.sb_width = evts[i].u.resize.width; data->curcfg.sb_height = evts[i].u.resize.height; @@ -303,7 +303,7 @@ break; case CONSOLE_RENDERER_UPDATE_EVENT: if (WINE_TRACE_ON(wineconsole)) - WINE_DPRINTF(" update(%d,%d)", evts[i].u.update.top, evts[i].u.update.bottom); + WINE_TRACE(" update(%d,%d)", evts[i].u.update.top, evts[i].u.update.bottom); WINECON_FetchCells(data, evts[i].u.update.top, evts[i].u.update.bottom); break; case CONSOLE_RENDERER_CURSOR_POS_EVENT: @@ -313,7 +313,7 @@ data->cursor.Y = evts[i].u.cursor_pos.y; data->fnPosCursor(data); if (WINE_TRACE_ON(wineconsole)) - WINE_DPRINTF(" curs-pos(%d,%d)",evts[i].u.cursor_pos.x, evts[i].u.cursor_pos.y); + WINE_TRACE(" curs-pos(%d,%d)",evts[i].u.cursor_pos.x, evts[i].u.cursor_pos.y); } break; case CONSOLE_RENDERER_CURSOR_GEOM_EVENT: @@ -323,7 +323,7 @@ data->fnShapeCursor(data, evts[i].u.cursor_geom.size, evts[i].u.cursor_geom.visible, FALSE); if (WINE_TRACE_ON(wineconsole)) - WINE_DPRINTF(" curs-geom(%d,%d)", + WINE_TRACE(" curs-geom(%d,%d)", evts[i].u.cursor_geom.size, evts[i].u.cursor_geom.visible); } break; @@ -333,34 +333,34 @@ data->fnScroll(data, evts[i].u.display.left, TRUE); data->fnPosCursor(data); if (WINE_TRACE_ON(wineconsole)) - WINE_DPRINTF(" h-scroll(%d)", evts[i].u.display.left); + WINE_TRACE(" h-scroll(%d)", evts[i].u.display.left); } if (evts[i].u.display.top != data->curcfg.win_pos.Y) { data->fnScroll(data, evts[i].u.display.top, FALSE); data->fnPosCursor(data); if (WINE_TRACE_ON(wineconsole)) - WINE_DPRINTF(" v-scroll(%d)", evts[i].u.display.top); + WINE_TRACE(" v-scroll(%d)", evts[i].u.display.top); } if (evts[i].u.display.width != data->curcfg.win_width || evts[i].u.display.height != data->curcfg.win_height) { if (WINE_TRACE_ON(wineconsole)) - WINE_DPRINTF(" win-size(%d,%d)", evts[i].u.display.width, evts[i].u.display.height); + WINE_TRACE(" win-size(%d,%d)", evts[i].u.display.width, evts[i].u.display.height); data->curcfg.win_width = evts[i].u.display.width; data->curcfg.win_height = evts[i].u.display.height; data->fnComputePositions(data); } break; case CONSOLE_RENDERER_EXIT_EVENT: - if (WINE_TRACE_ON(wineconsole)) WINE_DPRINTF(". Exit!!\n"); + if (WINE_TRACE_ON(wineconsole)) WINE_TRACE(". Exit!!\n"); return 0; default: WINE_FIXME("Unknown event type (%d)\n", evts[i].event); } } - if (WINE_TRACE_ON(wineconsole)) WINE_DPRINTF(".\n"); + if (WINE_TRACE_ON(wineconsole)) WINE_TRACE(".\n"); return 1; }
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Le Samedi 15 Mars 2003 01:29, Tony Lambregts a écrit :
This completes the first stage of DPRINTF->TRACE. There are still a lot of files that use DPRINTF. The following is a list of the files I where I did not replace DPRINTF with TRACE along with a breif explanation. I would appreciate any comments on this or any of the patches that I submitted over the last day.
<snip>
dlls/d3d8/device.c........... perhaps this should be a FIXME no its better to have a TRACE macro here, i'll do it it's really usefull trace for debugging dlls/d3d8/shader.c........... frankly I don't want to touch it.<g> lol for this use of DPRINT i don't have any cosmetic solution ;( i wanted to print the shaders and declaration code as:
... trace:d3d:Direct3DVertexShaderImpl_ParseProgram vs.1.1 m4x4 oPos, V[0], C[4] frc R[0].x.y, C[0].x add oT[0].x.y, V[7], R[0] add oT[1].x.y, V[7], -R[0] mov R[0].x, -C[0].y mov R[0].y, C[0].y frc R[0].x.y, R[0] add oT[2].x.y, V[7], R[0] add oT[3].x.y, V[7], -R[0] mov oT[4], V[7] trace:d3d:IDirect3DDeviceImpl_CreateVertexShaderDeclaration8 (0x403d7290) : pDeclaration8(0x44a040) ... but i can't without use of DPRINTF ... but if you have a better solution ? Reagards, Raphael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE+cxAZp7NA3AmQTU4RAp16AJsGPE8dK7faxpAJiFQPYJIJ68UAGwCfR4Mv 7MrA9zIH5umr4aL1VozQofU= =0pSb -----END PGP SIGNATURE-----
participants (3)
-
Eric Pouech -
Raphaël Junqueira -
Tony Lambregts