Changeset 3648 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

added more logging

Location:

trunk/src/gdi32

Files:

• gdi32.cpp (modified) (6 diffs)
• text.cpp (modified) (7 diffs)

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.48 2000-06-01 11:27:05 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.49 2000-06-01 19:00:05 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #include <stdarg.h>
 #include <string.h>
+#include <odinwrap.h>
 #include "misc.h"
 #include "callback.h"
@@ -24 +25 @@
 #define DBG_LOCALLOG    DBG_gdi32
 #include "dbglocal.h"
+
+ODINDEBUGCHANNEL(GDI32-GDI32)
 
 //******************************************************************************
@@ -1077 +1080 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API LPtoDP( HDC arg1, PPOINT arg2, int  arg3)
-{
-    dprintf(("GDI32: LPtoDP"));
-    return O32_LPtoDP(arg1, arg2, arg3);
+ODINFUNCTION3(BOOL, LPtoDP, HDC, hdc, PPOINT, lpPoints, int, nCount)
+{
+    return O32_LPtoDP(hdc, lpPoints, nCount);
 }
 //******************************************************************************
@@ -1256 +1258 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API SetMapMode( HDC arg1, int  arg2)
-{
-    dprintf(("GDI32: SetMapMode"));
-    return O32_SetMapMode(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-DWORD WIN32API SetMapperFlags( HDC arg1, DWORD  arg2)
-{
-    dprintf(("GDI32: SetMapperFlags"));
-    return O32_SetMapperFlags(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetMiterLimit( HDC arg1, float  arg2, float *  arg3)
-{
-    dprintf(("GDI32: SetMiterLimit"));
-    return O32_SetMiterLimit(arg1, arg2, arg3);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API SetPolyFillMode( HDC arg1, int  arg2)
-{
-    dprintf(("GDI32: SetPolyFillMode"));
-    return O32_SetPolyFillMode(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-UINT WIN32API SetTextAlign( HDC arg1, UINT  arg2)
-{
-    dprintf(("GDI32: SetTextAlign"));
-    return O32_SetTextAlign(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API SetTextCharacterExtra( HDC arg1, int  arg2)
-{
-    dprintf(("GDI32: SetTextCharacterExtra"));
-    return O32_SetTextCharacterExtra(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetTextJustification( HDC arg1, int arg2, int  arg3)
-{
-    dprintf(("GDI32: SetTextJustification"));
-    return O32_SetTextJustification(arg1, arg2, arg3);
+ODINFUNCTION2(int, SetMapMode, HDC, hdc, int, fnMapMode)
+{
+    return O32_SetMapMode(hdc, fnMapMode);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION2(DWORD, SetMapperFlags, HDC, hdc, DWORD, dwFlag)
+{
+    return O32_SetMapperFlags(hdc, dwFlag);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION3(BOOL, SetMiterLimit, HDC, hdc, float, eNewLimit, float* ,peOldLimit)
+{
+    return O32_SetMiterLimit(hdc, eNewLimit, peOldLimit);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION2(int, SetPolyFillMode, HDC, hdc, int, iPolyFillMode)
+{
+    return O32_SetPolyFillMode(hdc, iPolyFillMode);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION2(UINT, SetTextAlign, HDC, hdc, UINT, fMode)
+{
+    return O32_SetTextAlign(hdc, fMode);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION2(int, SetTextCharacterExtra, HDC, hdc, int, nCharExtra)
+{
+    return O32_SetTextCharacterExtra(hdc, nCharExtra);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION3(BOOL, SetTextJustification, HDC, hdc, int, nBreakExtra, int, nBreakCount)
+{
+    return O32_SetTextJustification(hdc, nBreakExtra, nBreakCount);
 }
 //******************************************************************************
@@ -1363 +1358 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API UnrealizeObject( HGDIOBJ arg1)
-{
-    dprintf(("GDI32: UnrealizeObject"));
-    return O32_UnrealizeObject(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API WidenPath( HDC arg1)
-{
-    dprintf(("GDI32: WidenPath"));
-    return O32_WidenPath(arg1);
+BOOL WIN32API UnrealizeObject( HGDIOBJ hObject)
+{
+    dprintf(("GDI32: UnrealizeObject %x", hObject));
+    return O32_UnrealizeObject(hObject);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API WidenPath( HDC hdc)
+{
+    dprintf(("GDI32: WidenPath %x", hdc));
+    return O32_WidenPath(hdc);
 }
 //******************************************************************************

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