Changeset 10365 for trunk/src

Timestamp:

Dec 29, 2003, 12:54:54 PM (22 years ago)

Author:

sandervl

Message:

KOM: GetTextExtentPointW fix; GetTextExtentExPointA fix for DBCS leadbytes

File:

• trunk/src/gdi32/text.cpp (modified) (6 diffs)

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.36 2003-12-29 10:55:49 sandervl Exp $ */
+/* $Id: text.cpp,v 1.37 2003-12-29 11:54:54 sandervl Exp $ */
 
 /*
@@ -409 +409 @@
    pDCData    pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
 
-   dprintf(("GDI32: GetTextExtentPointW %x %.*ls %d", hdc, cbString, lpString, cbString));
+   dprintf(("GDI32: GetTextExtentPointW %ls", lpString));
    if(pHps == NULL)
    {
@@ -460 +460 @@
    lstrcpynWtoA(astring, lpString, len + 1 );
 
-   rc = OSLibGpiQueryTextBox(pHps, cbString, astring, TXTBOXOS_COUNT, pts);
+   rc = OSLibGpiQueryTextBox(pHps, len, astring, TXTBOXOS_COUNT, pts);
    free(astring);
 
@@ -480 +480 @@
    }
 
-   dprintf(("GDI32: GetTextExtentPointW %x %.*ls %d returned %d (%d,%d)", hdc, cbString, lpString, cbString, rc, lpSize->cx, lpSize->cy));
+   dprintf(("GDI32: GetTextExtentPointW %x %ls %d returned %d (%d,%d)", hdc, lpString, cbString, rc, lpSize->cx, lpSize->cy));
    SetLastError(ERROR_SUCCESS);
    return TRUE;
@@ -511 +511 @@
     ret = GetTextExtentExPointW( hdc, p, wlen, maxExt, lpnFit, alpDx, size);
     if (lpnFit) *lpnFit = WideCharToMultiByte(CP_ACP,0,p,*lpnFit,NULL,0,NULL,NULL);
+    if( IsDBCSEnv() && alpDx ) /* index of alpDx between ansi and wide may not match in DBCS !!! */
+    {
+        LPINT alpDxNew = ( LPINT )HeapAlloc( GetProcessHeap(), 0, *lpnFit );
+        int i, j;
+
+        for( i = j = 0; i < *lpnFit; i++, j++ )
+        {
+            if( IsDBCSLeadByte( str[ i ]))
+            {
+                alpDxNew[ i++ ] = alpDx[ j ] >> 1;
+                if( i < *lpnFit )
+                    alpDxNew[ i ] = alpDx[ j ] >> 1;
+            }
+            else
+                alpDxNew[ i ] = alpDx[ j ];
+
+        }
+
+        memcpy( alpDx, alpDxNew, sizeof( alpDx[ 0 ] ) * *lpnFit );
+
+        HeapFree( GetProcessHeap(), 0, alpDxNew );
+    }
     HeapFree( GetProcessHeap(), 0, p );
     return ret;
@@ -531 +553 @@
     for(index = 0; index < count; index++)
     {
-        if(!GetTextExtentPoint32W( hdc, str, 1, &tSize )) goto done;
+    if(!GetTextExtentPoint32W( hdc, str, 1, &tSize )) goto done;
         /* GetTextExtentPoint includes intercharacter spacing. */
         /* FIXME - justification needs doing yet.  Remember that the base
          * data will not be in logical coordinates.
          */
-        extent += tSize.cx;
-        if( !lpnFit || extent <= maxExt )
+    extent += tSize.cx;
+    if( !lpnFit || extent <= maxExt )
         /* It is allowed to be equal. */
         {
-            nFit++;
-            if( alpDx ) alpDx[index] = extent;
+        nFit++;
+        if( alpDx ) alpDx[index] = extent;
         }
-        if( tSize.cy > size->cy ) size->cy = tSize.cy;
-        str++;
+    if( tSize.cy > size->cy ) size->cy = tSize.cy;
+    str++;
     }
     size->cx = extent;