Rollback last change

reactos/subsys/win32k/objects

diff -u -r1.117 -r1.118
--- text.c	17 Dec 2004 17:40:29 -0000	1.117
+++ text.c	18 Dec 2004 09:39:14 -0000	1.118
@@ -22,7 +22,7 @@

  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */

-/* $Id: text.c,v 1.117 2004/12/17 17:40:29 gvg Exp $ */

+/* $Id: text.c,v 1.118 2004/12/18 09:39:14 gvg Exp $ */

 #include <w32k.h>
 
 #include <ft2build.h>

@@ -1647,11 +1647,11 @@

    IntLockFreeType;
    error = FT_Set_Pixel_Sizes(
       face,

-      TextObj->logfont.lfWidth,

       /* FIXME should set character height if neg */
       (TextObj->logfont.lfHeight < 0 ?
       - TextObj->logfont.lfHeight :

-      TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));

+      TextObj->logfont.lfHeight),
+      TextObj->logfont.lfWidth);

    IntUnLockFreeType;
    if (error)
    {

@@ -2030,11 +2030,11 @@

 
    IntLockFreeType;
    FT_Set_Pixel_Sizes(face,

-                      TextObj->logfont.lfWidth,

                       /* FIXME should set character height if neg */
                       (TextObj->logfont.lfHeight < 0 ?
                        - TextObj->logfont.lfHeight :

-                       TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));

+                       TextObj->logfont.lfHeight),
+                      TextObj->logfont.lfWidth);

 
    for (i = FirstChar; i <= LastChar; i++)
    {

@@ -2188,11 +2188,11 @@

 
   IntLockFreeType;
   error = FT_Set_Pixel_Sizes(face,

-                             TextObj->logfont.lfWidth,

                              /* FIXME should set character height if neg */
                              (TextObj->logfont.lfHeight < 0 ?
                               - TextObj->logfont.lfHeight :

-                              TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));

+                              TextObj->logfont.lfHeight),
+                             TextObj->logfont.lfWidth);

   IntUnLockFreeType;
   if (error)
     {

@@ -2543,11 +2543,11 @@

       Face = FontGDI->face;
       IntLockFreeType;
       Error = FT_Set_Pixel_Sizes(Face,

-	                         TextObj->logfont.lfWidth,

 	                         /* FIXME should set character height if neg */

-                                 (TextObj->logfont.lfHeight < 0 ?
-                                  - TextObj->logfont.lfHeight :
-                                  TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));

+	                         (TextObj->logfont.lfHeight < 0 ?
+	                          - TextObj->logfont.lfHeight :
+	                          TextObj->logfont.lfHeight),
+	                         TextObj->logfont.lfWidth);

       IntUnLockFreeType;
       if (0 != Error)
 	{