Changeset 10600 for trunk/src/gdi32/ft2supp.cpp

Timestamp:

May 7, 2004, 12:27:50 PM (21 years ago)

Author:

sandervl

Message:

KOM: DBCS updates

File:

• trunk/src/gdi32/ft2supp.cpp (modified) (3 diffs)

trunk/src/gdi32/ft2supp.cpp

@@ -262 +262 @@
 
         DecreaseLogCount();
-        if(GetTextMetricsW( hps, &tmW ) == TRUE) 
+        if(GetTextMetricsW( hps, &tmW ) == TRUE)
         {
             pwidthHeight->y = tmW.tmHeight;    // *Must* use the maximum height of the font
@@ -316 +316 @@
     int   len;
     LPSTR astring;
+    LPINT lpDx = NULL;
 
     pDCData pHps = (pDCData)OSLibGpiQueryDCData(hps);
@@ -323 +324 @@
     lstrcpynWtoA(astring, pchString, len + 1 );
 
+    if( IsDBCSEnv() && alAdx )
+    {
+        int i, j;
+
+        lpDx = ( LPINT )malloc( len * sizeof( INT ));
+        for( i = j = 0; i < len; i++, j++ )
+        {
+            lpDx[ i ] = alAdx[ j ];
+            if( IsDBCSLeadByte( astring[ i ]))
+                lpDx[ ++i ] = 0;
+        }
+
+        alAdx = ( CONST INT * )lpDx;
+    }
+
     ret = OSLibGpiCharStringPosAt(pHps,ptl,rct,flOptions,len,astring,alAdx);
+
+    if( lpDx )
+        free( lpDx );
+
     free(astring);
+
     return ret;
 }