Changeset 10163 for trunk/src/gdi32/text.cpp

Timestamp:

Jul 14, 2003, 3:43:33 PM (22 years ago)

Author:

sandervl

Message:

KOM: Fixed InternalTextOutW() and GetTextExtentPointW() to support unicode correctly. (DBCS)

File:

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

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.33 2003-03-03 16:33:35 sandervl Exp $ */
+/* $Id: text.cpp,v 1.34 2003-07-14 13:43:15 sandervl Exp $ */
 
 /*
@@ -107 +107 @@
   if(pHps->yInvert > 0) {
      Y = pHps->yInvert - Y;
-  } 
+  }
 #endif
 
@@ -139 +139 @@
           pmRect.yTop    = pHps->yInvert - pmRect.yBottom;
           pmRect.yBottom = temp;
-      }    
+      }
 #endif
 #endif
@@ -210 +210 @@
     BOOL rc;
     PPOINTLOS2 pts = (PPOINTLOS2)malloc((cbCount+1)*sizeof(POINTLOS2));
- 
+
     rc = OSLibGpiQueryCharStringPosAt(pHps,&ptl,flOptions & CHSOS_VECTOR,cbCount,lpszString,lpDx,pts);
     if(rc) {
@@ -236 +236 @@
 
   int vertAdjust = 0;
-  if ((pHps->taMode & 0x18) != TA_TOP) 
+  if ((pHps->taMode & 0x18) != TA_TOP)
   {
       vertAdjust = OSLibGpiQueryFontMaxHeight(pHps->hps);
@@ -281 +281 @@
      astring = UnicodeToAsciiString((LPWSTR)lpszString);
   }
-  else 
-  if(cbCount) {
-     astring = (char *)HEAP_malloc(cbCount+1);
-     UnicodeToAsciiN((LPWSTR)lpszString, astring, cbCount+1);
-     astring[cbCount] = 0;
-  }
-  rc = InternalTextOutA(hdc,X,Y,fuOptions,lprc,(LPCSTR)astring,cbCount,lpDx,IsExtTextOut);
+  else
+  if(cbCount >= 0) {
+     int n = WideCharToMultiByte( CP_ACP, 0, lpszString, cbCount, 0, 0, NULL, NULL ) + 1;
+
+     astring = (char *)HEAP_malloc( n );
+     UnicodeToAsciiN((LPWSTR)lpszString, astring, n );
+  }
+
+  rc = InternalTextOutA(hdc,X,Y,fuOptions,lprc,(LPCSTR)astring, strlen( astring ),lpDx,IsExtTextOut);
   if(astring) {
       FreeAsciiString(astring);
@@ -320 +322 @@
   if(astring)
       free(astring);
- 
+
   return(rc);
 }
@@ -443 +445 @@
       return TRUE;
    }
-   if(cbString > 512) 
+   if(cbString > 512)
    {
       DWORD cbStringNew;
@@ -468 +470 @@
    if(rc == FALSE)
    {
-      SetLastError(ERROR_INVALID_PARAMETER);    //todo wrong error
+      SetLastError(ERROR_INVALID_PARAMETER);    //todo wrong error
       return FALSE;
    }
@@ -496 +498 @@
 {
   char *astring;
-  BOOL  rc;
+  int  len;
+  BOOL rc;
 
    if(lpString == NULL || cbString < 0 || lpSize == NULL)
@@ -518 +521 @@
    dprintf(("GDI32: GetTextExtentPointW %x %.*ls %d %x", hdc, cbString, lpString, cbString, lpSize));
 
-   astring = (char *)malloc((cbString+1)*sizeof(WCHAR));
-   UnicodeToAsciiN(lpString, astring, cbString+1);
-
+   len = WideCharToMultiByte( CP_ACP, 0, lpString, cbString, 0, 0, NULL, NULL );
+   astring = (char *)malloc( len + 1 );
+   UnicodeToAsciiN(lpString, astring, len + 1 );
    rc = GetTextExtentPointA(hdc, astring,
-                            cbString, lpSize);
+                            len, lpSize);
 
    free(astring);