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

Timestamp:

Jun 1, 2000, 9:00:05 PM (25 years ago)

Author:

sandervl

Message:

added more logging

File:

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

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.9 2000-05-02 20:49:58 sandervl Exp $ */
+/* $Id: text.cpp,v 1.10 2000-06-01 19:00:05 sandervl Exp $ */
 
 /*
@@ -576 +576 @@
   if (!pHps || (cbCount < 0) || ((lpszString == NULL) && (cbCount != 0)))
   {
-    SetLastError(ERROR_INVALID_HANDLE);
-    return FALSE;
+        dprintf(("InternalTextOutA: invalid parameter"));
+        SetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
   }
 
   if (cbCount > 512)
   {
-    SetLastError(ERROR_INVALID_PARAMETER);
-    return FALSE;
+        dprintf(("InternalTextOutA: invalid parameter cbCount"));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
   }
   if (fuOptions & ~((UINT)(ETO_CLIPPED | ETO_OPAQUE)))
   {
-    //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;
   }
 
@@ -600 +603 @@
       if (excludeBottomRightPoint(pHps,(PPOINTLOS2)&pmRect) == 0)
       {
+        dprintf(("InternalTextOutA: excludeBottomRightPoint returned 0"));
         return TRUE;
       }
@@ -606 +610 @@
       if (fuOptions & ETO_OPAQUE)  flOptions |= CHSOS_OPAQUE;
     }
-  } else
+  } 
+  else
   {
     if (fuOptions)
     {
-      SetLastError(ERROR_INVALID_HANDLE);
-      return FALSE;
+        dprintf(("InternalTextOutA: ERROR_INVALID_HANDLE"));
+        SetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
     }
   }
@@ -619 +625 @@
     if (fuOptions & ETO_OPAQUE)
     {
-      lpszString = " ";
-      cbCount = 1;
-      flOptions |= CHSOS_CLIP;
-    } else return TRUE;
+        lpszString = " ";
+        cbCount = 1;
+        flOptions |= CHSOS_CLIP;
+    } 
+    else {
+        dprintf(("InternalTextOutA: cbCount == 0"));
+        return TRUE;
+    }
   }
   if (lpDx)
@@ -633 +643 @@
 
     flOptions |= CHSOS_LEAVEPOS;
-  } else OSLibGpiQueryCurrentPosition(pHps,&ptl);
+  } 
+  else OSLibGpiQueryCurrentPosition(pHps,&ptl);
 
   UINT align = GetTextAlign(hdc);
@@ -663 +674 @@
     OSLibGpiSetTextAlignment(pHps,pmHAlign,pmVAlign);
 
-  if (hits == GPIOS_ERROR)
-    return FALSE;
+  if(hits == GPIOS_ERROR) {
+        dprintf(("InternalTextOutA: OSLibGpiCharStringPosAt returned GPIOS_ERROR"));
+        return FALSE;
+  }
 
   if (getAlignUpdateCP(pHps))