commit 156570906febd26e55778f96653037254f3308bf
author Alexandre Julliard <julliard@winehq.org> Sun May 23 10:25:25 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun May 23 10:25:25 1999 +0000
tree 615e7121dbb58b71ff5d615a72bedd8a4f50968f
parent 158f00ed8d3d04f0188d9b533c1d705681adcc59

Converted to the new debug interface, using script written by Patrik
Stridvall.

objects/text.c

diff --git a/objects/text.c b/objects/text.c
index 00a0923..37b6b9f 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -11,7 +11,7 @@
 #include "dc.h"
 #include "gdi.h"
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "cache.h"
 #include "debugstr.h"
 
@@ -202,7 +202,7 @@
     int width = rect->right - rect->left;
     int max_width = 0;
 
-    TRACE(text,"%s, %d , [(%d,%d),(%d,%d)]\n",
+    TRACE("%s, %d , [(%d,%d),(%d,%d)]\n",
 	  debugstr_an (str, count), count,
 	  rect->left, rect->top, rect->right, rect->bottom);
     
@@ -325,9 +325,9 @@
 INT WINAPI DrawTextExA( HDC hdc, LPCSTR str, INT count,
                      LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
 {
-    TRACE(text,"(%d,'%s',%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp);
+    TRACE("(%d,'%s',%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp);
     if(dtp) {
-        FIXME(text,"Ignores params:%d,%d,%d,%d,%d\n",dtp->cbSize,
+        FIXME("Ignores params:%d,%d,%d,%d,%d\n",dtp->cbSize,
                    dtp->iTabLength,dtp->iLeftMargin,dtp->iRightMargin,
                    dtp->uiLengthDrawn);
     }
@@ -340,8 +340,8 @@
 INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT count,
                      LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp )
 {
-    TRACE(text,"(%d,%p,%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp);
-    FIXME(text,"ignores extended functionality\n");
+    TRACE("(%d,%p,%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp);
+    FIXME("ignores extended functionality\n");
     return DrawTextW(hdc,str,count,rect,flags);
 }
 
@@ -641,7 +641,7 @@
                              INT16 count, INT16 cTabStops,
                              const INT16 *lpTabPos, INT16 nTabOrg )
 {
-    TRACE(text, "%04x %d,%d '%.*s' %d\n",
+    TRACE("%04x %d,%d '%.*s' %d\n",
                   hdc, x, y, count, lpstr, count );
     return TEXT_TabbedTextOut( hdc, x, y, lpstr, count, cTabStops,
                                lpTabPos, NULL, nTabOrg, TRUE );
@@ -655,7 +655,7 @@
                               INT count, INT cTabStops,
                               const INT *lpTabPos, INT nTabOrg )
 {
-    TRACE(text, "%04x %d,%d '%.*s' %d\n",
+    TRACE("%04x %d,%d '%.*s' %d\n",
                   hdc, x, y, count, lpstr, count );
     return TEXT_TabbedTextOut( hdc, x, y, lpstr, count, cTabStops,
                                NULL, lpTabPos, nTabOrg, TRUE );
@@ -685,7 +685,7 @@
 DWORD WINAPI GetTabbedTextExtent16( HDC16 hdc, LPCSTR lpstr, INT16 count, 
                                     INT16 cTabStops, const INT16 *lpTabPos )
 {
-    TRACE(text, "%04x '%.*s' %d\n",
+    TRACE("%04x '%.*s' %d\n",
                   hdc, count, lpstr, count );
     return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops,
                                lpTabPos, NULL, 0, FALSE );
@@ -698,7 +698,7 @@
 DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count, 
                                      INT cTabStops, const INT *lpTabPos )
 {
-    TRACE(text, "%04x '%.*s' %d\n",
+    TRACE("%04x '%.*s' %d\n",
                   hdc, count, lpstr, count );
     return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops,
                                NULL, lpTabPos, 0, FALSE );