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

Timestamp:

Aug 14, 2000, 5:51:20 PM (25 years ago)

Author:

cbratschi

Message:

activated WinDrawText

File:

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

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.10 2000-06-01 19:00:05 sandervl Exp $ */
+/* $Id: text.cpp,v 1.11 2000-08-14 15:51:20 cbratschi Exp $ */
 
 /*
@@ -7 +7 @@
  *
  * Copyright 1993, 1994 Alexandre Julliard
- * Copyright 1999 Christoph Bratschi
+ * Copyright 1999-2000 Christoph Bratschi
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -19 +19 @@
 #include "oslibgpi.h"
 
-#define DBG_LOCALLOG    DBG_text
+#define DBG_LOCALLOG    DBG_text
 #include "dbglocal.h"
 
@@ -95 +95 @@
 INT SYSTEM EXPORT InternalDrawTextExA(HDC hdc,LPCSTR lpchText,INT cchText,LPRECT lprc,UINT dwDTFormat,LPDRAWTEXTPARAMS lpDTParams,BOOL isDrawTextEx)
 {
-/*
-  PVOID pHps = OSLibGpiQueryDCData(hdc);
   INT rc;
   ULONG flCmd;
@@ -102 +100 @@
   PRECT rectPtr;
   LONG lTabs,xLeft,yTop;
-
-  if ((!lpchText) || (cchText == 0) || (cchText < -1) || (!lprc == NULL))
+  UINT fpuctrlword;
+
+  //SvL: Open32's DrawText messes up the fpu control word! (@#$@#$@#$)
+  //CB: don't know if this is still the case with WinDrawTabbedText (-> testcase)
+  fpuctrlword = _control87(0, 0);
+
+  if ((!lpchText) || (cchText == 0) || (cchText < -1) || (lprc == NULL))
   {
     SetLastError(ERROR_INVALID_PARAMETER);
     return 0;
   }
+
+  PVOID pHps = OSLibGpiQueryDCData(hdc);
 
   if (!pHps)
@@ -199 +204 @@
     rectPtr = &localRectangle;
 
-    if (getMapMode(pHps) == MMOS_ANISOTROPIC || getMapMode(pHps) == MMOS_ISOTROPIC)
+    if ((getMapMode(pHps) == MMOS_ANISOTROPIC) || (getMapMode(pHps) == MMOS_ISOTROPIC))
     {
       if (doesYAxisGrowNorth(pHps))
@@ -232 +237 @@
     if (isDrawTextEx)
     {
-      lTabs = (lpDTParams && dwDTFormat & DT_TABSTOP) ? lpDTParams->iTabLength:8;
+      lTabs = (lpDTParams && (dwDTFormat & DT_TABSTOP)) ? lpDTParams->iTabLength:8;
     } else
     {
@@ -385 +390 @@
 
   if (!done)
+  {
     rc = OSLibWinDrawTabbedText(pHps,cchText,lTabs,lpchText,rectPtr,0,0,flCmd);
+  }
 
   if (dwDTFormat & DT_CALCRECT)
@@ -408 +415 @@
   }
 
-  return rc;
-*/
-  UINT fpuctrlword;
-  INT rc;
-
-  //SvL: Open32's DrawText messes up the fpu control word! (@#$@#$@#$)
-  fpuctrlword = _control87(0, 0);
-  dwDTFormat &= ~(DT_END_ELLIPSIS | DT_PATH_ELLIPSIS);
-
-  rc = O32_DrawText(hdc,lpchText,cchText,lprc,dwDTFormat);
   _control87(fpuctrlword, 0xFFFF);
+
   return rc;
 }
@@ -576 +574 @@
   if (!pHps || (cbCount < 0) || ((lpszString == NULL) && (cbCount != 0)))
   {
-        dprintf(("InternalTextOutA: invalid parameter"));
-        SetLastError(ERROR_INVALID_HANDLE);
-        return FALSE;
+        dprintf(("InternalTextOutA: invalid parameter"));
+        SetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
   }
 
   if (cbCount > 512)
   {
-        dprintf(("InternalTextOutA: invalid parameter cbCount"));
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
+        dprintf(("InternalTextOutA: invalid parameter cbCount"));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
   }
   if (fuOptions & ~((UINT)(ETO_CLIPPED | ETO_OPAQUE)))
   {
-        dprintf(("InternalTextOutA: invalid fuOptions"));
-        //ETO_GLYPH_INDEX, ETO_RTLLEADING, ETO_NUMERICSLOCAL, ETO_NUMERICSLATIN, ETO_IGNORELANGUAGE, ETO_PDY  are ignored
-        return TRUE;
+        dprintf(("InternalTextOutA: invalid fuOptions"));
+        //ETO_GLYPH_INDEX, ETO_RTLLEADING, ETO_NUMERICSLOCAL, ETO_NUMERICSLATIN, ETO_IGNORELANGUAGE, ETO_PDY  are ignored
+        return TRUE;
   }
 
@@ -603 +601 @@
       if (excludeBottomRightPoint(pHps,(PPOINTLOS2)&pmRect) == 0)
       {
-        dprintf(("InternalTextOutA: excludeBottomRightPoint returned 0"));
+        dprintf(("InternalTextOutA: excludeBottomRightPoint returned 0"));
         return TRUE;
       }
@@ -610 +608 @@
       if (fuOptions & ETO_OPAQUE)  flOptions |= CHSOS_OPAQUE;
     }
-  } 
+  }
   else
   {
     if (fuOptions)
     {
-        dprintf(("InternalTextOutA: ERROR_INVALID_HANDLE"));
-        SetLastError(ERROR_INVALID_HANDLE);
-        return FALSE;
+        dprintf(("InternalTextOutA: ERROR_INVALID_HANDLE"));
+        SetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
     }
   }
@@ -625 +623 @@
     if (fuOptions & ETO_OPAQUE)
     {
-        lpszString = " ";
-        cbCount = 1;
-        flOptions |= CHSOS_CLIP;
-    } 
+        lpszString = " ";
+        cbCount = 1;
+        flOptions |= CHSOS_CLIP;
+    }
     else {
-        dprintf(("InternalTextOutA: cbCount == 0"));
-        return TRUE;
+        dprintf(("InternalTextOutA: cbCount == 0"));
+        return TRUE;
     }
   }
@@ -643 +641 @@
 
     flOptions |= CHSOS_LEAVEPOS;
-  } 
+  }
   else OSLibGpiQueryCurrentPosition(pHps,&ptl);
 
@@ -675 +673 @@
 
   if(hits == GPIOS_ERROR) {
-        dprintf(("InternalTextOutA: OSLibGpiCharStringPosAt returned GPIOS_ERROR"));
-        return FALSE;
+        dprintf(("InternalTextOutA: OSLibGpiCharStringPosAt returned GPIOS_ERROR"));
+        return FALSE;
   }