[ros-diffs] [jimtabor] 20965: Revert GetCharWidth32A change.

[jimtabor at svn.reactos.org]

Revert GetCharWidth32A change.
Modified: trunk/reactos/lib/gdi32/objects/font.c
  _____  

Modified: trunk/reactos/lib/gdi32/objects/font.c
--- trunk/reactos/lib/gdi32/objects/font.c	2006-01-21 22:36:37 UTC
(rev 20964)
+++ trunk/reactos/lib/gdi32/objects/font.c	2006-01-21 23:00:16 UTC
(rev 20965)
@@ -414,34 +414,8 @@

 	LPINT	lpBuffer
 	)
 {
-    INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1);
-    LPSTR str;
-    LPWSTR wstr;
-    BOOL ret = TRUE;
-
-    if(count <= 0) return FALSE;
-
-    str = HeapAlloc(GetProcessHeap(), 0, count);
-    for(i = 0; i < count; i++)
-	str[i] = (BYTE)(iFirstChar + i);
-
-    wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL);
-
-    for(i = 0; i < wlen; i++)
-    {
-        /* FIXME should be NtGdiGetCharWidthW */
-	if(!NtGdiGetCharWidth32(hdc, wstr[i], wstr[i], lpBuffer))
-	{
-	    ret = FALSE;
-	    break;
-	}
-	lpBuffer++;
-    }
-
-    HeapFree(GetProcessHeap(), 0, str);
-    HeapFree(GetProcessHeap(), 0, wstr);
-
-    return ret;
+   /* FIXME should be NtGdiGetCharWidthW */
+   return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer))
 }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20060121/eb45e222/attachment.html