Changeset 19304

Timestamp:

Jun 25, 2002, 9:11:32 AM (23 years ago)

Author:

sandervl

Message:

KSO: Use %.*s and %.*ls when we have a string with a length. (Crashing in logging is awfull. Creates zombiesoslibres.cpp)

File:

• tags/trunk/src/user32/text.c (modified) (11 diffs)

tags/trunk/src/user32/text.c ¶

@@ -55 +55 @@
 /*********************************************************************
  *  Return next line of text from a string.
- * 
+ *
  * hdc - handle to DC.
  * str - string to parse into lines.
@@ -68 +68 @@
  *
  * FIXME:
- * GetTextExtentPoint is used to get the width of each character, 
+ * GetTextExtentPoint is used to get the width of each character,
  * rather than GetCharABCWidth...  So the whitespace between
  * characters is ignored, and the reported len is too great.
@@ -110 +110 @@
             }
             break;
-            
+        
         case PREFIX:
             if (!(format & DT_NOPREFIX) && *count > 1)
@@ -130 +130 @@
             }
             break;
-            
+        
         case TAB:
             if (format & DT_EXPANDTABS)
@@ -207 +207 @@
         }
     }
-    
+
     *len = j;
     return NULL;
@@ -253 +253 @@
 
 #ifdef __WIN32OS2__
-    dprintf(("DrawTextExW: %ls, %d , [(%d,%d),(%d,%d)]\n", str, count,
+    dprintf(("DrawTextExW: %.*ls, %d , [(%d,%d),(%d,%d)]\n", count, str, count,
             rect->left, rect->top, rect->right, rect->bottom));
 #else
@@ -500 +500 @@
  * We are going to get a lot of code-duplication once this migration is
  * completed...
- * 
+ *
  */
 static BOOL TEXT_GrayString(HDC hdc, HBRUSH hb, GRAYSTRINGPROC fn, LPARAM lp, INT len,
@@ -522 +522 @@
     if(!hdc) return FALSE;
 #endif
-    
+
     if(len == 0)
     {
@@ -740 +740 @@
 {
 #ifdef __WIN32OS2__
-    dprintf(("TabbedTextOutA: %04x %d,%d %s %d\n", hdc, x, y, lpstr, count ));
+    dprintf(("TabbedTextOutA: %04x %d,%d %.*s %d\n", hdc, x, y, count, lpstr, count ));
 #else
     TRACE("%04x %d,%d %s %d\n", hdc, x, y, debugstr_an(lpstr,count), count );
@@ -762 +762 @@
     acount = WideCharToMultiByte(codepage,0,str,count,NULL,0,NULL,NULL);
     p = HeapAlloc( GetProcessHeap(), 0, acount );
-    if(p == NULL) return 0; /* FIXME: is this the correct return on failure */ 
+    if(p == NULL) return 0; /* FIXME: is this the correct return on failure */
     acount = WideCharToMultiByte(codepage,0,str,count,p,acount,NULL,NULL);
     ret = TabbedTextOutA( hdc, x, y, p, acount, cTabStops, lpTabPos, nTabOrg );
@@ -790 +790 @@
 {
 #ifdef __WIN32OS2__
-    dprintf(("GetTabbedTextExtentA: %04x %s %d\n", hdc, lpstr, count ));
+    dprintf(("GetTabbedTextExtentA: %04x %.*s %d\n", hdc, count, lpstr, count ));
 #else
     TRACE("%04x %s %d\n", hdc, debugstr_an(lpstr,count), count );