Changeset 4552 for trunk/src/gdi32/line.cpp

Timestamp:

Nov 4, 2000, 5:29:24 PM (25 years ago)

Author:

sandervl

Message:

OffsetRgn fix + small changes

File:

• trunk/src/gdi32/line.cpp (modified) (14 diffs)

trunk/src/gdi32/line.cpp

@@ -1 @@
-/* $Id: line.cpp,v 1.6 2000-02-16 14:18:10 sandervl Exp $ */
+/* $Id: line.cpp,v 1.7 2000-11-04 16:29:24 sandervl Exp $ */
 /*
  * Line API's
@@ -14 +14 @@
 #include "callback.h"
 #include "oslibgpi.h"
+#include <dcdata.h>
 
 #define DBG_LOCALLOG    DBG_line
@@ -48 +49 @@
 }
 
-BOOL drawSingleLinePoint(HDC hdc,PVOID pHps,PPOINTLOS2 pt)
+BOOL drawSingleLinePoint(HDC hdc,pDCData pHps,PPOINTLOS2 pt)
 {
   LOGPEN penInfo;
@@ -72 +73 @@
 BOOL WIN32API MoveToEx( HDC hdc, int X, int Y, LPPOINT lpPoint)
 {
-  PVOID pHps = OSLibGpiQueryDCData(hdc);
+  pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
 
   dprintf(("GDI32: MoveToEx %x (%d,%d)", hdc, X, Y));
@@ -79 +80 @@
   {
     POINTLOS2 newPoint = {X,Y};
+
+#ifndef INVERT
+    if(pHps->yInvert > 0) {
+         newPoint.y =  pHps->yInvert - newPoint.y;
+         if (lpPoint) {
+            lpPoint->y = pHps->yInvert - lpPoint->y;
+         }
+    }
+#endif
 
     if (lpPoint)
@@ -105 +115 @@
 BOOL WIN32API LineTo( HDC hdc, int nXEnd, int  nYEnd)
 {
-  PVOID pHps = OSLibGpiQueryDCData(hdc);
+  pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
   BOOL rc = TRUE;
 
@@ -114 +124 @@
     POINTLOS2 oldPoint,newPoint;
     BOOL bWideLine;
+
+#ifndef INVERT
+    if (pHps->yInvert > 0) {
+       nYEnd = pHps->yInvert - nYEnd;
+    }
+#endif
 
     //CB: add metafile info
@@ -151 +167 @@
 {
   BOOL                 rc;
+#ifndef STDCALL_ENUMPROCS
   LineDDAProcCallback *callback = new LineDDAProcCallback(lpLineFunc, lpData);
+#endif
   POINTLOS2 startPt,endPt;
 
@@ -160 +178 @@
   toWin32LineEnd(&startPt,nXEnd,nYEnd,&endPt);
 
-  rc = O32_LineDDA(startPt.x,startPt.y,endPt.x,endPt.y,callback->GetOS2Callback(),(LPARAM)callback);
+  rc = O32_LineDDA(startPt.x,startPt.y,endPt.x,endPt.y, lpLineFunc, lpData);
+#else
+#ifdef STDCALL_ENUMPROCS
+  //should change os2win.h
+  rc = O32_LineDDA(nXStart,nYStart,nXEnd,nYEnd, (LINEDDAPROC_O32)lpLineFunc, lpData);
 #else
   rc = O32_LineDDA(nXStart,nYStart,nXEnd,nYEnd,callback->GetOS2Callback(),(LPARAM)callback);
-#endif
   if(callback)
         delete callback;
+#endif
+
+#endif
   return(rc);
 }
@@ -172 +196 @@
 BOOL WIN32API Polyline( HDC hdc, const POINT *lppt, int cPoints)
 {
-  PVOID pHps = OSLibGpiQueryDCData(hdc);
+  pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
 
   dprintf(("GDI32: Polyline"));
@@ -186 +210 @@
   {
     SetLastError(ERROR_INVALID_PARAMETER);
-
     return FALSE;
   }
@@ -193 +216 @@
   {
     drawSingleLinePoint(hdc,pHps,(PPOINTLOS2)lppt); //CB: check metafile recording
-
     return TRUE;
   }
@@ -211 +233 @@
 BOOL WIN32API PolylineTo( HDC hdc, const POINT * lppt, DWORD cCount)
 {
-  PVOID pHps = OSLibGpiQueryDCData(hdc);
+  pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
 
   dprintf(("GDI32: PolylineTo"));
@@ -228 +250 @@
   {
     drawSingleLinePoint(hdc,pHps,(PPOINTLOS2)lppt);
-
     return TRUE;
   }