Changeset 10597 for trunk/src

Timestamp:

May 5, 2004, 11:19:11 AM (22 years ago)

Author:

sandervl

Message:

updates

Location:

trunk/src/gdi32

Files:

• line.cpp (modified) (2 diffs)
• printer.cpp (modified) (2 diffs)

trunk/src/gdi32/line.cpp

@@ -1 @@
-/* $Id: line.cpp,v 1.17 2004-04-30 13:27:18 sandervl Exp $ */
+/* $Id: line.cpp,v 1.18 2004-05-05 09:19:10 sandervl Exp $ */
 /*
  * Line API's
@@ -168 +168 @@
     toWin32LineEnd(pHps, &oldPoint,nXEnd,nYEnd,&newPoint);
 
-    if ((oldPoint.x == newPoint.x) && (oldPoint.y == newPoint.y))
+    if (!pHps->inPath && (oldPoint.x == newPoint.x) && (oldPoint.y == newPoint.y))
     {
       rc = drawSingleLinePoint(hdc,pHps,&newPoint);
-    } else
-    {
-      if (getIsWideLine(pHps))
+    } 
+    else
+    {
+      if (!pHps->inPath && getIsWideLine(pHps))
       {
         rc = O32_LineTo(hdc,newPoint.x,newPoint.y); //CB: wide line not supported
-      } else
+      } 
+      else
       {
         if (OSLibGpiLine(pHps,&newPoint) == FALSE)

trunk/src/gdi32/printer.cpp

@@ -1 @@
-/* $Id: printer.cpp,v 1.2 2004-01-11 11:42:21 sandervl Exp $ */
+/* $Id: printer.cpp,v 1.3 2004-05-05 09:19:11 sandervl Exp $ */
 
 /*
@@ -180 +180 @@
     else dprintf(("GDI32: StartDocA %x %x", hdc, lpDocInfo));
 
+    dprintf(("lpDocInfo->cbSize %x", lpDocInfo->cbSize)); 
+    dprintf(("lpDocInfo->lpszDocName %s", lpDocInfo->lpszDocName)); 
+    dprintf(("lpDocInfo->lpszOutput %s", lpDocInfo->lpszOutput)); 
+    dprintf(("lpDocInfo->lpszDatatype %s", lpDocInfo->lpszDatatype)); 
+    dprintf(("lpDocInfo->fwType %x", lpDocInfo->fwType)); 
+
     ret = O32_StartDoc(hdc, (LPDOCINFOA)lpDocInfo);