commit 7cbe65725a22825f544cc35979c329fbb57f2767
author Alexandre Julliard <julliard@winehq.org> Mon Jan 09 18:21:16 1995 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jan 09 18:21:16 1995 +0000
tree 6f20df2908f011611012ce225bbcf61754f8c451
parent 3a5816f87ea2954aa957c87974912fe0ca04b823

Release 950109

Thu Jan  5 13:37:42 1995  Cameron Heide  (heide@ee.ualberta.ca)

	* [memory/global.c]
	GlobalCompact should now return the correct value when the
	largest run of free blocks includes the last block.

	* [windows/mdi.c]
	Tiling and cascading windows without any MDI children should
	no longer crash (assuming no-op is the correct thing to do).

Sun Jan  1 23:30:25 1995  Fons Botman  <botman@rabo.nl>

	* [objects/font.c]
	GetTextExtentPoint: fixed debug output, str is counted string, not
        zero terminated.

	* [if1632/relay.c]
	DLLRelay: when debugging_stack got segv, added upper bound for
        stack dump.

objects/text.c

diff --git a/objects/text.c b/objects/text.c
index c28f3b0..186b729 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -52,7 +52,7 @@
     int numspaces;
     SIZE size;
     int lasttab = 0;
-    int wb_i = 0, wb_j = 0, wb_count;
+    int wb_i = 0, wb_j = 0, wb_count = 0;
 
     while (*count)
     {
@@ -301,8 +301,8 @@
     if (!DC_SetupGCForText( dc )) return TRUE;
     font = dc->u.x.font.fstruct;
 
-    dprintf_text(stddeb,"ExtTextOut: %d,%d '%s', %d  flags=%d rect=%d,%d,%d,%d\n",
-            x, y, str, count, flags,
+    dprintf_text(stddeb,"ExtTextOut: %d,%d '%*.*s', %d  flags=%d rect=%d,%d,%d,%d\n",
+            x, y, count, count, str, count, flags,
             lprect->left, lprect->top, lprect->right, lprect->bottom );
 
       /* Setup coordinates */
@@ -424,7 +424,7 @@
                 continue;  /* First iteration -> no delta */
             }
             pitem->delta = dc->w.charExtra;
-            if (str[i] == dc->u.x.font.metrics.tmBreakChar)
+            if (str[i] == (char)dc->u.x.font.metrics.tmBreakChar)
                 pitem->delta += dc->w.breakExtra;
             if (lpDx)
             {
@@ -565,8 +565,8 @@
 LONG TabbedTextOut( HDC hdc, short x, short y, LPSTR lpstr, short count, 
                     short cTabStops, LPINT lpTabPos, short nTabOrg )
 {
-    dprintf_text( stddeb, "TabbedTextOut: %x %d,%d '%s' %d\n",
-                  hdc, x, y, lpstr, count );
+    dprintf_text( stddeb, "TabbedTextOut: %x %d,%d '%*.*s' %d\n",
+                  hdc, x, y, count, count, lpstr, count );
     return TEXT_TabbedTextOut( hdc, x, y, lpstr, count, cTabStops,
                                lpTabPos, nTabOrg, TRUE );
 }
@@ -578,8 +578,8 @@
 DWORD GetTabbedTextExtent( HDC hdc, LPSTR lpstr, int count, 
                           int cTabStops, LPINT lpTabPos )
 {
-    dprintf_text( stddeb, "GetTabbedTextExtent: %x '%s' %d\n",
-                  hdc, lpstr, count );
+    dprintf_text( stddeb, "GetTabbedTextExtent: %x '%*.*s' %d\n",
+                  hdc, count, count, lpstr, count );
     return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops,
                                lpTabPos, 0, FALSE );
 }