Changeset 5044 for trunk/src

Timestamp:

Feb 1, 2001, 7:01:52 PM (25 years ago)

Author:

sandervl

Message:

callback fixes

Location:

trunk/src/gdi32

Files:

• CALLBACK.CPP (modified) (3 diffs)
• gdi32.cpp (modified) (2 diffs)
• line.cpp (modified) (3 diffs)
• makefile (modified) (2 diffs)
• metafile.cpp (modified) (2 diffs)

trunk/src/gdi32/CALLBACK.CPP

@@ -1 @@
-/* $Id: CALLBACK.CPP,v 1.6 2000-11-04 16:29:23 sandervl Exp $ */
+/* $Id: CALLBACK.CPP,v 1.7 2001-02-01 18:01:52 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #define DBG_LOCALLOG    DBG_callback
 #include "dbglocal.h"
-
-#ifndef STDCALL_ENUMPROCS
 
 static VOID OPEN32API Callback(int X, int Y, LPARAM lpData);
@@ -55 +53 @@
 //******************************************************************************
 
-#endif //#ifndef STDCALL_ENUMPROCS
+

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.65 2001-01-18 18:13:17 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.66 2001-02-01 18:01:52 sandervl Exp $ */
 
 /*
@@ -634 +634 @@
 int WIN32API EnumObjects( HDC hdc, int objType, GOBJENUMPROC objFunc, LPARAM lParam)
 {
-#ifdef STDCALL_ENUMPROCS
-    dprintf(("GDI32: EnumObjects %x %d %x %x", hdc, objType, objFunc, lParam));
-    //should change os2win.h
-    return O32_EnumObjects(hdc, objType, (GOBJENUMPROC_O32)objFunc, lParam);
-#else
     //calling convention differences
-    dprintf(("GDI32: EnumObjects STUB"));
+    dprintf(("ERROR: GDI32: EnumObjects STUB"));
 //    return O32_EnumObjects(arg1, arg2, arg3, arg4);
     return 0;
-#endif
 }
 //******************************************************************************

trunk/src/gdi32/line.cpp

@@ -1 @@
-/* $Id: line.cpp,v 1.8 2001-01-18 18:13:17 sandervl Exp $ */
+/* $Id: line.cpp,v 1.9 2001-02-01 18:01:52 sandervl Exp $ */
 /*
  * Line API's
@@ -167 +167 @@
 {
   BOOL                 rc;
-#ifndef STDCALL_ENUMPROCS
   LineDDAProcCallback *callback = new LineDDAProcCallback(lpLineFunc, lpData);
-#endif
   POINTLOS2 startPt,endPt;
 
@@ -180 +178 @@
   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);
   if(callback)
         delete callback;
 #endif
-
-#endif
   return(rc);
 }

trunk/src/gdi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.33 2001-01-09 18:12:58 sandervl Exp $
+# $Id: makefile,v 1.34 2001-02-01 18:01:52 sandervl Exp $
 
 #
@@ -17 +17 @@
 # Overrides.
 #
-CDEFINES    = $(CDEFINES) -DINVERT -DSTDCALL_ENUMPROCS
+CDEFINES    = $(CDEFINES) -DINVERT
 
 

trunk/src/gdi32/metafile.cpp

@@ -1 @@
-/* $Id: metafile.cpp,v 1.3 2000-11-04 16:29:24 sandervl Exp $ */
+/* $Id: metafile.cpp,v 1.4 2001-02-01 18:01:52 sandervl Exp $ */
 
 /*
@@ -134 +134 @@
 BOOL WIN32API EnumMetaFile( HDC hdc, HMETAFILE hMetafile, MFENUMPROC metaProc, LPARAM lParam)
 {
-#ifdef STDCALL_ENUMPROCS
-    dprintf(("GDI32: EnumMetaFile %x %x %x %x", hdc, hMetafile, metaProc, lParam));
-    //should change os2win.h
-    return O32_EnumMetaFile(hdc, hMetafile, (MFENUMPROC_O32)metaProc, lParam);
-#else
     dprintf(("GDI32: EnumMetaFile NOT IMPLEMENTED"));
     //calling convention differences
 //    return O32_EnumMetaFile(arg1, arg2, arg3, arg4);
     return 0;
-#endif
 }
 //******************************************************************************