Changeset 2802 for trunk/src/gdi32

Timestamp:

Feb 16, 2000, 3:25:43 PM (26 years ago)

Author:

sandervl

Message:

Added new logging feature

Location:

trunk/src/gdi32

Files:

• CALLBACK.CPP (modified) (2 diffs)
• blit.cpp (modified) (3 diffs)
• dbglocal.cpp (added)
• dbglocal.h (added)
• dibitmap.cpp (modified) (3 diffs)
• dibsect.cpp (modified) (4 diffs)
• font.cpp (modified) (2 diffs)
• gdi32.cpp (modified) (2 diffs)
• initterm.cpp (modified) (3 diffs)
• line.cpp (modified) (2 diffs)
• makefile (modified) (2 diffs)
• metafile.cpp (modified) (2 diffs)
• opengl.cpp (modified) (2 diffs)
• oslibgdi.cpp (modified) (2 diffs)
• oslibgpi.cpp (modified) (2 diffs)
• palette.cpp (modified) (2 diffs)
• region.cpp (modified) (2 diffs)
• text.cpp (modified) (2 diffs)

trunk/src/gdi32/CALLBACK.CPP

@@ -1 @@
-/* $Id: CALLBACK.CPP,v 1.3 1999-06-10 17:09:02 phaller Exp $ */
+/* $Id: CALLBACK.CPP,v 1.4 2000-02-16 14:18:09 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include "misc.h"
 #include "callback.h"
+
+#define DBG_LOCALLOG    DBG_callback
+#include "dbglocal.h"
 
 static VOID OPEN32API Callback(int X, int Y, LPARAM lpData);

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.4 2000-02-03 18:59:04 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.5 2000-02-16 14:18:09 sandervl Exp $ */
 
 /*
@@ -18 +18 @@
 #include "dibsect.h"
 #include "rgbcvt.h"
+
+#define DBG_LOCALLOG    DBG_blit
+#include "dbglocal.h"
 
 static ULONG QueryPaletteSize(BITMAPINFOHEADER *pBHdr);
@@ -134 +137 @@
         DWORD *bitfields = (DWORD *)info->bmiColors;
 
-        dprintf(("BI_BITFIELDS compression %x %x %x", *bitfields, *(bitfields+1), *(bitfields+2)));
         ((BITMAPINFO *)info)->bmiHeader.biCompression = 0;
         compression = BI_BITFIELDS;
         if(*(bitfields+1) == 0x3E0) 
         {//RGB 555?
+                dprintf(("BI_BITFIELDS compression %x %x %x", *bitfields, *(bitfields+1), *(bitfields+2)));
+
                 newbits = (WORD *)malloc(imgsize);
                 if(CPUFeatures & CPUID_MMX) {

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.3 2000-02-10 00:36:10 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.4 2000-02-16 14:18:09 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #include "dibsect.h"
 
+#define DBG_LOCALLOG    DBG_dibitmap
+#include "dbglocal.h"
+
 //******************************************************************************
 //******************************************************************************
@@ -31 +34 @@
     if(lpbmih->biHeight < 0)
     {
-      ((BITMAPINFOHEADER *)lpbmih)->biHeight = -lpbmih->biHeight;
+        dprintf(("GDI32: CreateDIBitmap negative height! (%d,%d)", lpbmih->biWidth, lpbmih->biHeight));
+        ((BITMAPINFOHEADER *)lpbmih)->biHeight = -lpbmih->biHeight;
     }
 

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.17 2000-02-10 00:36:10 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.18 2000-02-16 14:18:09 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #include "oslibgpi.h"
 
+#define DBG_LOCALLOG    DBG_dibsect
+#include "dbglocal.h"
+
 //Win32 apis used:
 HWND WIN32API WindowFromDC(HDC hdc);
@@ -237 +240 @@
    if(bmpsize & 3)
    {
-     bmpsize = (bmpsize + 3) & ~3;
+        bmpsize = (bmpsize + 3) & ~3;
    }
 
@@ -251 +254 @@
    pOS2bmp->cbImage       = pbmi->biSizeImage;
 
+   dprintf(("DIBSection::SetDIBits (%d,%d), %d %d", pbmi->biWidth, pbmi->biHeight, pbmi->biBitCount, pbmi->biCompression));
+
    if(palsize)
      memcpy(pOS2bmp->argbColor, (char *)pbmi + 1 , palsize);

trunk/src/gdi32/font.cpp

@@ -1 @@
-/* $Id: font.cpp,v 1.8 1999-12-05 14:58:07 phaller Exp $ */
+/* $Id: font.cpp,v 1.9 2000-02-16 14:18:09 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #include <win\options.h>
 
+#define DBG_LOCALLOG    DBG_font
+#include "dbglocal.h"
 
 ODINDEBUGCHANNEL(GDI32-FONT)

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.42 2000-02-14 17:28:45 cbratschi Exp $ */
+/* $Id: gdi32.cpp,v 1.43 2000-02-16 14:18:09 sandervl Exp $ */
 
 /*
@@ -21 +21 @@
 #include "oslibgpi.h"
 #include "oslibgdi.h"
+
+#define DBG_LOCALLOG    DBG_gdi32
+#include "dbglocal.h"
 
 //******************************************************************************

trunk/src/gdi32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.9 2000-02-05 01:59:24 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.10 2000-02-16 14:18:10 sandervl Exp $ */
 
 /*
@@ -36 +36 @@
 #include <odinlx.h>
 #include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
+#define DBG_LOCALLOG    DBG_initterm
+#include "dbglocal.h"
 
 extern "C" {
@@ -87 +89 @@
          _ctordtorInit();
 
+         ParseLogStatus();
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 

trunk/src/gdi32/line.cpp

@@ -1 @@
-/* $Id: line.cpp,v 1.5 2000-02-12 18:08:57 cbratschi Exp $ */
+/* $Id: line.cpp,v 1.6 2000-02-16 14:18:10 sandervl Exp $ */
 /*
  * Line API's
@@ -15 +15 @@
 #include "oslibgpi.h"
 
+#define DBG_LOCALLOG    DBG_line
+#include "dbglocal.h"
+
 #define ROUND_FLOAT(x) ((INT)((x < 0) ? x-0.5:x+0.5))
 

trunk/src/gdi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.21 2000-02-09 23:46:56 bird Exp $
+# $Id: makefile,v 1.22 2000-02-16 14:18:10 sandervl Exp $
 
 #
@@ -23 +23 @@
 OBJS =  gdi32.obj opengl.obj callback.obj dibsect.obj initterm.obj resource.obj \
         oslibgdi.obj font.obj text.obj palette.obj line.obj oslibgpi.obj region.obj \
-        metafile.obj dibitmap.obj blit.obj rgbcvt.obj
+        metafile.obj dibitmap.obj blit.obj rgbcvt.obj dbglocal.obj
 
 

trunk/src/gdi32/metafile.cpp

@@ -1 @@
-/* $Id: metafile.cpp,v 1.1 2000-02-01 12:53:30 sandervl Exp $ */
+/* $Id: metafile.cpp,v 1.2 2000-02-16 14:18:11 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #include "misc.h"
 
+#define DBG_LOCALLOG    DBG_metafile
+#include "dbglocal.h"
+
 //******************************************************************************
 //******************************************************************************

trunk/src/gdi32/opengl.cpp

@@ -1 @@
-/* $Id: opengl.cpp,v 1.7 2000-02-05 15:55:54 sandervl Exp $ */
+/* $Id: opengl.cpp,v 1.8 2000-02-16 14:18:11 sandervl Exp $ */
 
 /*
@@ -21 +21 @@
 #include "misc.h"
 #include "unicode.h"
+
+#define DBG_LOCALLOG    DBG_opengl
+#include "dbglocal.h"
 
 

trunk/src/gdi32/oslibgdi.cpp

@@ -1 @@
-/* $Id: oslibgdi.cpp,v 1.5 2000-02-02 23:45:07 sandervl Exp $ */
+/* $Id: oslibgdi.cpp,v 1.6 2000-02-16 14:18:11 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
 #include "dibsect.h"
 #include "oslibgdi.h"
+
+#define DBG_LOCALLOG    DBG_oslibgdi
+#include "dbglocal.h"
 
 //******************************************************************************

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.3 2000-01-20 21:39:36 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.4 2000-02-16 14:18:11 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 #include "dcdata.h"
 
+#define DBG_LOCALLOG    DBG_oslibgpi
+#include "dbglocal.h"
+
 #define GetDCData(a) ((pDCData)a)
 

trunk/src/gdi32/palette.cpp

@@ -1 @@
-/* $Id: palette.cpp,v 1.2 2000-02-01 12:53:31 sandervl Exp $ */
+/* $Id: palette.cpp,v 1.3 2000-02-16 14:18:12 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #include <string.h>
 #include "dibsect.h"
+
+#define DBG_LOCALLOG    DBG_palette
+#include "dbglocal.h"
 
 static UINT SystemPaletteUse = SYSPAL_STATIC;  /* currently not considered */

trunk/src/gdi32/region.cpp

@@ -1 @@
-/* $Id: region.cpp,v 1.1 2000-02-01 12:53:31 sandervl Exp $ */
+/* $Id: region.cpp,v 1.2 2000-02-16 14:18:12 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #include <string.h>
 #include "misc.h"
+
+#define DBG_LOCALLOG    DBG_region
+#include "dbglocal.h"
 
 //******************************************************************************

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.7 2000-01-29 14:22:13 sandervl Exp $ */
+/* $Id: text.cpp,v 1.8 2000-02-16 14:18:12 sandervl Exp $ */
 
 /*
@@ -18 +18 @@
 #include <float.h>
 #include "oslibgpi.h"
+
+#define DBG_LOCALLOG    DBG_text
+#include "dbglocal.h"
 
 #define ELLIPSIS    "..."