Changeset 10583 for trunk/src

Timestamp:

Apr 14, 2004, 11:44:36 AM (22 years ago)

Author:

sandervl

Message:

updates

Location:

trunk/src/gdi32

Files:

• opengl.cpp (modified) (1 diff)
• oslibgpi.cpp (modified) (2 diffs)
• palette.cpp (modified) (3 diffs)

trunk/src/gdi32/opengl.cpp

@@ -1 @@
-/* $Id: opengl.cpp,v 1.11 2004-04-14 09:44:13 sandervl Exp $ */
+/* $Id: opengl.cpp,v 1.12 2004-04-14 09:44:36 sandervl Exp $ */
 
 /*

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.17 2004-01-11 11:42:19 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.18 2004-04-14 09:44:13 sandervl Exp $ */
 
 /*
@@ -395 +395 @@
   BOOL rc = GpiSetAttrs(GetDCData(pHps)->hps,PRIM_LINE,LBB_COLOR,0,&lbNew);
   if(rc == FALSE) {
-      dprintf(("GpiSetAttrs/GpiSetPel failed with %x", WinGetLastError(0)));
+      dprintf(("GpiSetAttrs failed with %x", WinGetLastError(0)));
   }
   else {
       rc = GpiSetPel(GetDCData(pHps)->hps,(PPOINTL)pt) != GPI_ERROR;
-      if(rc == FALSE && LOWORD(WinGetLastError(0)) == PMERR_INV_IN_PATH) {
-          dprintf(("WARNING: GpiSetPel invalid in path; retrying with GpiLine"));
+      if(rc == FALSE) {
+          dprintf(("WARNING: GpiSetPel failed %x (invalid in path?); retrying with GpiLine", WinGetLastError(0)));
           rc = GpiLine(GetDCData(pHps)->hps,(PPOINTL)pt) != GPI_ERROR;
       }

trunk/src/gdi32/palette.cpp

@@ -1 @@
-/* $Id: palette.cpp,v 1.12 2004-01-11 11:42:20 sandervl Exp $ */
+/* $Id: palette.cpp,v 1.13 2004-04-14 09:44:14 sandervl Exp $ */
 
 /*
@@ -138 +138 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API SetPaletteEntries( HPALETTE hPalette, UINT arg2, UINT arg3, PALETTEENTRY * arg4)
+UINT WIN32API SetPaletteEntries( HPALETTE hPalette, UINT arg2, UINT arg3, const PALETTEENTRY * arg4)
 {
     dprintf(("GDI32: SetPaletteEntries %x %d-%d %x", hPalette, arg2, arg3, arg4));
@@ -167 +167 @@
                 Palette.aEntries[i].peGreen = g * 51;
                 Palette.aEntries[i].peBlue = b * 51;
-            }    
+            }
           }
         }