Changeset 10594 for trunk/src


Ignore:
Timestamp:
Apr 30, 2004, 3:27:19 PM (21 years ago)
Author:
sandervl
Message:

drawSingleLinePoint: wrong pen style checks; logging updates

Location:
trunk/src/gdi32
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/gdi32/gdi32.cpp

    r10442 r10594  
    1 /* $Id: gdi32.cpp,v 1.93 2004-02-10 15:35:38 sandervl Exp $ */
     1/* $Id: gdi32.cpp,v 1.94 2004-04-30 13:27:18 sandervl Exp $ */
    22
    33/*
    … …  
    176176 HPEN hPen;
    177177
     178    if(lplb) {
     179        dprintf(("lbStyle %x", lplb->lbStyle));
     180        dprintf(("lbColor %x", lplb->lbColor));
     181        dprintf(("lbHatch %x", lplb->lbHatch));
     182    }
    178183    hPen = O32_ExtCreatePen(dwPenStyle, dwWidth, lplb, dwStyleCount, lpStyle);
    179184    if(hPen) STATS_ExtCreatePen(hPen, dwPenStyle, dwWidth, lplb, dwStyleCount, lpStyle);
    … …  
    722727//******************************************************************************
    723728//******************************************************************************
    724 BOOL WIN32API PolyPolygon( HDC hdc, const POINT * arg2, const INT * arg3, UINT  arg4)
    725 {
    726     return O32_PolyPolygon(hdc, arg2, arg3, arg4);
     729BOOL WIN32API PolyPolygon( HDC hdc, const POINT *lpPoints, const INT *lpPolyCounts, UINT  nCount)
     730{
     731#ifdef DEBUG
     732    int count = 0;
     733    for(int i=0;i<nCount;i++)
     734    {
     735        for(int j=0;j<lpPolyCounts[i];j++)
     736        {
     737            dprintf(("Vertex %d point (%d,%d)", i, lpPoints[count].x, lpPoints[count].y));
     738            count++;
     739        }
     740    }
     741#endif
     742    return O32_PolyPolygon(hdc, lpPoints, lpPolyCounts, nCount);
    727743}
    728744//******************************************************************************

  • trunk/src/gdi32/line.cpp

    r10563 r10594  
    1 /* $Id: line.cpp,v 1.16 2004-03-25 15:06:37 sandervl Exp $ */
     1/* $Id: line.cpp,v 1.17 2004-04-30 13:27:18 sandervl Exp $ */
    22/*
    33 * Line API's
    … …  
    8585  if ((penInfo.lopnWidth.x > 1) || (penInfo.lopnWidth.y > 1))
    8686  {
    87     if ((penInfo.lopnStyle != PS_INSIDEFRAME) && (penInfo.lopnStyle != PS_SOLID))
    88       return FALSE;
     87    if (((penInfo.lopnStyle & PS_STYLE_MASK) != PS_INSIDEFRAME) && ((penInfo.lopnStyle & PS_STYLE_MASK) != PS_SOLID))
     88    {
     89        dprintf(("drawSingleLinePoint -> not PS_INSIDEFRAME nor PS_SOLID"));
     90        return TRUE; //TODO: ??
     91    }
    8992
    9093    LONG color = GetBValue(penInfo.lopnColor) | (GetGValue(penInfo.lopnColor)<<8) | (GetRValue(penInfo.lopnColor)<<16);
    9194
    9295    return drawLinePointCircle(pHps,penInfo.lopnWidth.x,penInfo.lopnWidth.y,color);
    93   } else
     96  }
     97  else
    9498  {
    9599    LONG color = GetBValue(penInfo.lopnColor) | (GetGValue(penInfo.lopnColor)<<8) | (GetRValue(penInfo.lopnColor)<<16);
    … …  
    159163    }
    160164#endif
    161 
    162165    //CB: add metafile info
    163166

  • trunk/src/gdi32/oslibgpi.cpp

    r10583 r10594  
    1 /* $Id: oslibgpi.cpp,v 1.18 2004-04-14 09:44:13 sandervl Exp $ */
     1/* $Id: oslibgpi.cpp,v 1.19 2004-04-30 13:27:18 sandervl Exp $ */
    22
    33/*
    … …  
    363363  arcp.lS = 0;
    364364  if (!GpiSetArcParams(GetDCData(pHps)->hps,&arcp))
    365     return FALSE;
     365  {
     366      dprintf(("drawLinePointCircle: GpiSetArcParams failed with %x!!", WinGetLastError(0)));
     367      return FALSE;
     368  }
    366369
    367370  AREABUNDLE newAreaBundle, oldAreaBundle;
    … …  
    378381
    379382  if (!GpiSetAttrs(GetDCData(pHps)->hps,PRIM_AREA,ABB_COLOR | ABB_MIX_MODE | ABB_SET | ABB_SYMBOL,0,(PBUNDLE)&newAreaBundle))
    380     return FALSE;
     383  {
     384      dprintf(("drawLinePointCircle: GpiSetAttrs failed with %x!!", WinGetLastError(0)));
     385      return FALSE;
     386  }
    381387
    382388  if (GpiFullArc(GetDCData(pHps)->hps,DRO_FILL,MAKEFIXED((width-1)>>1,0)) == GPI_ERROR)
    383     rc = FALSE;
     389  {
     390      dprintf(("drawLinePointCircle: GpiFullArc failed with %x!!", WinGetLastError(0)));
     391      rc = FALSE;
     392  }
    384393  GpiSetAttrs(GetDCData(pHps)->hps,PRIM_AREA,ABB_COLOR | ABB_MIX_MODE | ABB_SET | ABB_SYMBOL,0,(PBUNDLE)&oldAreaBundle);
    385394

  • trunk/src/gdi32/region.cpp

    r10465 r10594  
    1 /* $Id: region.cpp,v 1.40 2004-02-16 15:20:12 sandervl Exp $ */
     1/* $Id: region.cpp,v 1.41 2004-04-30 13:27:18 sandervl Exp $ */
    22
    33/*
    … …  
    683683        }
    684684        //SvL: Must check if origin changed here. Sometimes happens when
    685         //     window looses focus. (don't know why....)
     685        //     window loses focus. (don't know why....)
    686686        checkOrigin(pHps);
    687687

  • trunk/src/gdi32/text.cpp

    r10400 r10594  
    1 /* $Id: text.cpp,v 1.43 2004-01-15 11:18:58 sandervl Exp $ */
     1/* $Id: text.cpp,v 1.44 2004-04-30 13:27:19 sandervl Exp $ */
    22
    33/*
    … …  
    351351  else  dprintf(("GDI32: ExtTextOutA %x %.*s (%d,%d) %x %d %x", hdc, cbCount, lpszString, X, Y, fuOptions, cbCount, lpDx));
    352352
     353  if(lpDx) {
     354      for(int i=0;i<cbCount;i++) {
     355          dprintf2(("Inc %d", lpDx[i]));
     356      }
     357  }
    353358  rc = InternalTextOutAW(hdc, X, Y, fuOptions, lprc, lpszString, NULL, cbCount, lpDx, TRUE, FALSE);
    354359
Note: See TracChangeset for help on using the changeset viewer.