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

Timestamp:

Apr 21, 2011, 10:41:04 PM (14 years ago)

Author:

dmik

Message:

gdi32: Fixed broken TextOut API family that would draw text flipped along the base line.

File:

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

trunk/src/gdi32/text.cpp

@@ -95 +95 @@
 //******************************************************************************
 // todo: metafile support
-//#undef INVERT
-//#define INVERT_SETYINVERSION
 //******************************************************************************
 BOOL InternalTextOutAW(HDC hdc,int X,int Y,UINT fuOptions,
@@ -135 +133 @@
   }
 
-#if defined(INVERT) && !defined(INVERT_SETYINVERSION)
-  if(pHps->yInvert > 0) {
-     Y = pHps->yInvert - Y;
-  }
-#endif
-
-#ifdef INVERT_SETYINVERSION
-  int oldyinv = GpiQueryYInversion(pHps->hps);
-  Y = oldyinv - Y;
-#endif
-
   // When using font association, the height of DBCS and SBCS chars may be different.
   // In this case, background color make stair below chars
@@ -181 +168 @@
         return TRUE;
       }
-#ifndef INVERT
-#ifdef INVERT_SETYINVERSION
-      if (oldyinv) {
-          int temp       = oldyinv - pmRect.yTop;
-          pmRect.yTop    = oldyinv - pmRect.yBottom;
-          pmRect.yBottom = temp;
-      }
-#else
-      if (pHps->yInvert > 0) {
-          int temp       = pHps->yInvert - pmRect.yTop;
-          pmRect.yTop    = pHps->yInvert - pmRect.yBottom;
-          pmRect.yBottom = temp;
-      }
-#endif
-#endif
 
       if (fuOptions & ETO_CLIPPED) flOptions |= CHSOS_CLIP;
@@ -244 +216 @@
     }
   }
-
-#ifdef INVERT_SETYINVERSION
-  GpiEnableYInversion(pHps->hps, 0);
-#endif
 
   if (lpDx)
@@ -341 +309 @@
   if(hits == GPIOS_ERROR) {
       dprintf(("InternalTextOutA: OSLibGpiCharStringPosAt returned GPIOS_ERROR"));
-#ifdef INVERT_SETYINVERSION
-      GpiEnableYInversion(pHps->hps, oldyinv);
-#endif
       return FALSE;
   }
@@ -356 +321 @@
       OSLibGpiSetCurrentPosition(pHps,&ptl);
   }
-
-#ifdef INVERT_SETYINVERSION
-  GpiEnableYInversion(pHps->hps, oldyinv);
-#endif
 
   DIBSECTION_MARK_INVALID(hdc);