Changeset 21628 for trunk/src

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.

Location:

trunk/src/gdi32

Files:

• ft2supp.cpp (modified) (10 diffs)
• text.cpp (modified) (6 diffs)

trunk/src/gdi32/ft2supp.cpp

@@ -199 +199 @@
 DWORD CFT2Module::Ft2GetGlyphIndices(HPS hps, LPCWSTR str, int c, LPWORD pgi, DWORD fl)
 {
-    DWORD  ret; 
+    DWORD  ret;
     USHORT sel;
 
-    // All FreeType calls should be wrapped for saving FS 
+    // All FreeType calls should be wrapped for saving FS
     if(pfnGetGlyphIndices) {
         sel  = RestoreOS2FS();
         ret  = pfnGetGlyphIndices(hps, (WCHAR*)str, c, (ULONG*)pgi, fl);
         SetFS(sel);
-        return ret; 
+        return ret;
     }
     //no fallback
@@ -217 +217 @@
 DWORD CFT2Module::Ft2GetGlyphOutline(HPS hps, UINT glyph, UINT format, LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, const MAT2* lpmat)
 {
-    DWORD  ret; 
+    DWORD  ret;
     USHORT sel;
 
-    // All FreeType calls should be wrapped for saving FS 
+    // All FreeType calls should be wrapped for saving FS
     if (pfnFt2GetGlyphOutline)
     {
@@ -226 +226 @@
         ret  = pfnFt2GetGlyphOutline (hps, glyph, format, lpgm, buflen, buf, lpmat);
         SetFS(sel);
-        return ret; 
-    }
-    
+        return ret;
+    }
+
     //no fallback
     SetLastError(ERROR_INVALID_FUNCTION_W);
@@ -313 +313 @@
 //******************************************************************************
 //******************************************************************************
+struct CTISTATE
+{
+    pDCData pHps;
+    BOOL restoreInversion;
+    BOOL restoreMatrix;
+    LONG oldYInversion;
+    MATRIXLF mlf;
+};
+
+static void CompensateTextInversion(pDCData pHps, PPOINTLOS2 ptl, PRECTLOS2 rct,
+                                    CTISTATE *state)
+{
+    state->pHps = pHps;
+    state->restoreInversion = FALSE;
+    state->restoreMatrix = FALSE;
+
+    // The target HPS is most likely set up for Y inversion, to bring the origin
+    // from the bottom-left corner (PM) to the top-left (Win). However, PM text
+    // drawing routines make an exception for themselves and produce correct
+    // top-left oriented glyphs despite the bottom-left oriented coordinate
+    // space. Having the mentioned Y inversion makes them flip and display
+    // glyphs top to bottom. We need to cancel this flip to get the correct
+    // text orientation.
+
+    GpiQueryDefaultViewMatrix(pHps->hps, 9, &state->mlf);
+
+    if (state->mlf.fxM11 == MAKEFIXED(1, 0) && state->mlf.fxM12 == 0 &&
+        state->mlf.lM13 == 0 &&
+        state->mlf.fxM21 == 0 && state->mlf.fxM22 == MAKEFIXED(1, 0) &&
+        state->mlf.lM23 == 0 &&
+        state->mlf.lM31 == 0 && state->mlf.lM32 == 0 && state->mlf.lM33 == 1)
+    {
+        // the most common case: the identity matrix, the inversion is done...
+#ifdef INVERT
+        // ...through the special GPI call, cancel it and correct ptl/rct
+        state->oldYInversion = GpiQueryYInversion(pHps->hps);
+        if (state->oldYInversion != 0)
+        {
+            ptl->y = state->oldYInversion - ptl->y;
+            if (rct)
+            {
+                LONG temp = state->oldYInversion - rct->yBottom;
+                rct->yBottom = state->oldYInversion - rct->yTop;
+                rct->yTop = temp;
+            }
+
+            GpiEnableYInversion(pHps->hps, 0);
+
+            state->restoreInversion = TRUE;
+        }
+#else
+        // through the raw yInvert value
+        if (pHps->yInvert > 0)
+        {
+            LONG temp = pHps->yInvert - rct->yBottom;
+            rct->yBottom = pHps->yInvert - rct->yTop;
+            rct->yTop = temp;
+        }
+#endif
+    }
+    else
+    {
+        // the complex case: append a matrix transformation that will flip the
+        // text along the ptl's Y coordinate
+        MATRIXLF mlf;
+        mlf.fxM11 = MAKEFIXED(1, 0);
+        mlf.fxM12 = 0;
+        mlf.lM13  = 0;
+        mlf.fxM21 = 0;
+        mlf.fxM22 = MAKEFIXED(-1, 0);
+        mlf.lM23  = 0;
+        mlf.lM31  = 0;
+        mlf.lM32  = ptl->y * 2;
+        GpiSetDefaultViewMatrix(pHps->hps, 8, &mlf, TRANSFORM_ADD);
+
+        state->restoreMatrix = TRUE;
+    }
+}
+
+static void UncompensateTextInversion(CTISTATE *state)
+{
+    if (state->restoreInversion)
+        GpiEnableYInversion(state->pHps->hps, state->oldYInversion);
+    if (state->restoreMatrix)
+        GpiSetDefaultViewMatrix(state->pHps->hps, 9, &state->mlf,
+                                TRANSFORM_REPLACE);
+}
+//******************************************************************************
+//******************************************************************************
 BOOL CFT2Module::Ft2CharStringPosAtA(HPS hps,PPOINTLOS2 ptl,PRECTLOS2 rct,ULONG flOptions,LONG lCount,LPCSTR pchString,CONST INT *alAdx, DWORD fuWin32Options)
 {
     DWORD  ret;
     USHORT sel;
-
-    // All FreeType calls should be wrapped for saving FS
-    if(pfnFt2CharStringPosAtA) {
+    pDCData pHps;
+
+    pHps = (pDCData)OSLibGpiQueryDCData(hps);
+
+    CTISTATE ctiState;
+    CompensateTextInversion(pHps, ptl, rct, &ctiState);
+
+    BOOL fallback = TRUE;
+
+    if(pfnFt2CharStringPosAtA)
+    {
+        // All FreeType calls should be wrapped for saving FS
         sel  = RestoreOS2FS();
         ret  = pfnFt2CharStringPosAtA(hps, ptl,rct,flOptions,lCount,pchString,alAdx, fuWin32Options);
         SetFS(sel);
         if(ret || (ret == FALSE && ERRORIDERROR(WinGetLastError(0)) != PMERR_FUNCTION_NOT_SUPPORTED))
-            return ret;
-    }
-    //else fall back to GPI
-    //NOTE: We don't support fuWin32Options in the fallback case
-    pDCData pHps = (pDCData)OSLibGpiQueryDCData(hps);
-    return OSLibGpiCharStringPosAt(pHps,ptl,rct,flOptions,lCount,pchString,alAdx);
+            fallback = FALSE;
+    }
+
+    if (fallback)
+    {
+        //else fall back to GPI
+        //NOTE: We don't support fuWin32Options in the fallback case
+        ret = OSLibGpiCharStringPosAt(pHps,ptl,rct,flOptions,lCount,pchString,alAdx);
+    }
+
+    UncompensateTextInversion(&ctiState);
+
+    return ret;
 }
 //******************************************************************************
@@ -337 +442 @@
     DWORD  ret;
     USHORT sel;
-
-    // All FreeType calls should be wrapped for saving FS
-    if(pfnFt2CharStringPosAtW) {
+    pDCData pHps;
+
+    pHps = (pDCData)OSLibGpiQueryDCData(hps);
+
+    CTISTATE ctiState;
+    CompensateTextInversion(pHps, ptl, rct, &ctiState);
+
+    BOOL fallback = TRUE;
+
+    if (pfnFt2CharStringPosAtW)
+    {
+        // All FreeType calls should be wrapped for saving FS
         sel  = RestoreOS2FS();
         ret  = pfnFt2CharStringPosAtW(hps, ptl,rct,flOptions,lCount,pchString,alAdx, fuWin32Options);
         SetFS(sel);
         if(ret || (ret == FALSE && ERRORIDERROR(WinGetLastError(0)) != PMERR_FUNCTION_NOT_SUPPORTED))
-            return ret;
-    }
-    //else fall back to GPI
-    //NOTE: We don't support fuWin32Options in the fallback case
-    int   len;
-    LPSTR astring;
-    LPINT lpDx = NULL;
-
-    pDCData pHps = (pDCData)OSLibGpiQueryDCData(hps);
-
-    len = WideCharToMultiByte( CP_ACP, 0, pchString, lCount, 0, 0, NULL, NULL );
-    astring = (char *)malloc( len + 1 );
-    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++ )
+            fallback = FALSE;
+    }
+
+    if (fallback)
+    {
+        // fall back to GPI
+        // NOTE: We don't support fuWin32Options in the fallback case
+        int   len;
+        LPSTR astring;
+
+        LPINT lpDx = NULL;
+
+        len = WideCharToMultiByte( CP_ACP, 0, pchString, lCount, 0, 0, NULL, NULL );
+        astring = (char *)malloc( len + 1 );
+        lstrcpynWtoA(astring, pchString, len + 1 );
+
+        if( IsDBCSEnv() && alAdx )
         {
-            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);
+            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);
+    }
+
+    UncompensateTextInversion(&ctiState);
 
     return ret;
@@ -387 +506 @@
                                  LPVOID lpvBuffer, DWORD cbData)
 {
-    DWORD  ret; 
+    DWORD  ret;
     USHORT sel;
 
-    // All FreeType calls should be wrapped for saving FS 
+    // All FreeType calls should be wrapped for saving FS
     if(pfnFt2GetFontData) {
         sel  = RestoreOS2FS();
@@ -396 +515 @@
         SetFS(sel);
         if(ret || (ret == GDI_ERROR && ERRORIDERROR(WinGetLastError(0)) != PMERR_FUNCTION_NOT_SUPPORTED))
-            return ret; 
+            return ret;
     }
     //no fallback
@@ -546 +665 @@
             lpResults->lpOrder[i] = i;
 
-    // All FreeType calls should be wrapped for saving FS 
+    // All FreeType calls should be wrapped for saving FS
     if(pfnFt2GetCharacterPlacementW) {
         sel  = RestoreOS2FS();
@@ -566 +685 @@
 
                if(OSLibDevQueryCaps(pHps, OSLIB_CAPS_HORIZONTAL_RESOLUTION, 2, &alArray[0]) &&
-                  alArray[0] != alArray[1]) 
+                  alArray[0] != alArray[1])
                {
                    dprintf(("Different hor/vert resolutions (%d,%d)", alArray[0], alArray[1]));
@@ -581 +700 @@
                }
            }
-           return ret; 
+           return ret;
         }
     }

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);