Changeset 10434 for trunk/src

Timestamp:

Jan 30, 2004, 11:20:00 PM (22 years ago)

Author:

bird

Message:

#682: Test for DEBUG_LOGGING not DEBUG.

Location:

trunk/src/gdi32

Files:

• gdi32.cpp (modified) (6 diffs)
• region.cpp (modified) (37 diffs)

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.91 2004-01-11 11:42:15 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.92 2004-01-30 22:19:59 bird Exp $ */
 
 /*
@@ -171 +171 @@
 //******************************************************************************
 //******************************************************************************
-HPEN WIN32API ExtCreatePen(DWORD dwPenStyle, DWORD dwWidth, const LOGBRUSH *lplb, 
+HPEN WIN32API ExtCreatePen(DWORD dwPenStyle, DWORD dwWidth, const LOGBRUSH *lplb,
                            DWORD dwStyleCount, const DWORD *lpStyle)
 {
@@ -216 +216 @@
 {
  HBRUSH hBrush;
- 
+
     hBrush = O32_CreateHatchBrush(fnStyle, clrref);
     if(hBrush) STATS_CreateHatchBrush(hBrush, fnStyle, clrref);
@@ -265 +265 @@
   {
       dprintf(("GDI32: CreateDIBPatternBrush (%08xh, %08xh) %x (%d,%d) bpp %d",
-                hglbDIBPacked, fuColorSpec, lpMem, lpMem->bmiHeader.biWidth, 
+                hglbDIBPacked, fuColorSpec, lpMem, lpMem->bmiHeader.biWidth,
                 lpMem->bmiHeader.biHeight, lpMem->bmiHeader.biBitCount));
 
@@ -541 +541 @@
     return rc;
 }
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
 //******************************************************************************
 //******************************************************************************
@@ -760 +760 @@
        dprintf(("WARNING: GDI32: RectVisible %x lpRect == NULL!"));
        return FALSE;
-    }    
+    }
     dprintf(("GDI32: RectVisible %x (%d,%d)(%d,%d)", hdc, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom));
     return O32_RectVisible(hdc, lpRect);

trunk/src/gdi32/region.cpp

@@ -1 @@
-/* $Id: region.cpp,v 1.36 2004-01-11 11:42:21 sandervl Exp $ */
+/* $Id: region.cpp,v 1.37 2004-01-30 22:20:00 bird Exp $ */
 
 /*
@@ -15 +15 @@
  *       We do not map the Win32 visible region to the PM visible region
  *       as that's rather annoying.
- *       Instead we use the intersection of the win32 visible and win32 clip 
+ *       Instead we use the intersection of the win32 visible and win32 clip
  *       region for the PM clip region.
  *       The original Win32 clip region is saved in pHps->hrgnWin32Clip.
  *       The Win32 visible region is saved in pHps->hrgnWinVis.
- * 
+ *
  *
  *
@@ -426 +426 @@
 //
 // Parameters:
-// 
+//
 // pDCData pHps         - presentation space structure
 // HRGN hrgn            - region handle (GPI)
@@ -439 +439 @@
 //       We do not map the Win32 visible region to the PM visible region
 //       as that's rather annoying.
-//       Instead we use the intersection of the win32 visible and win32 clip 
+//       Instead we use the intersection of the win32 visible and win32 clip
 //       region for the PM clip region.
 //       The Win32 clip region is saved in pHps->hrgnWin32Clip.
@@ -456 +456 @@
     }
 
-    if(hrgn != NULLHANDLE) 
+    if(hrgn != NULLHANDLE)
     {
         hrgnNewClip = GpiCreateRegion(pHps->hps, 1, &rectl);
@@ -496 +496 @@
 //
 // Parameters:
-// 
+//
 // pDCData pHps         - presentation space structure
 // HRGN hrgn            - region handle (Win32)
@@ -510 +510 @@
 //       We do not map the Win32 visible region to the PM visible region
 //       as that's rather annoying.
-//       Instead we use the intersection of the win32 visible and win32 clip 
+//       Instead we use the intersection of the win32 visible and win32 clip
 //       region for the PM clip region.
 //       The Win32 clip region is saved in pHps->hrgnWin32Clip.
@@ -518 +518 @@
 INT WIN32API GdiCombineVisRgn(pDCData pHps, HRGN hrgn, INT operation)
 {
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
     HRGN hrgn1 = hrgn;
 #endif
@@ -541 +541 @@
 
     //If there is no visible region, then create one that covers the whole DC
-    if(pHps->hrgnWinVis == NULLHANDLE) 
+    if(pHps->hrgnWinVis == NULLHANDLE)
     {
          RECTL rectl = {0, 0, hdcWidth(0, pHps), hdcHeight(0, pHps)};
@@ -580 +580 @@
 //
 // Parameters:
-// 
+//
 // pDCData pHps         - presentation space structure
 // HRGN hrgn            - region handle (GPI)
@@ -594 +594 @@
 //       We do not map the Win32 visible region to the PM visible region
 //       as that's rather annoying.
-//       Instead we use the intersection of the win32 visible and win32 clip 
+//       Instead we use the intersection of the win32 visible and win32 clip
 //       region for the PM clip region.
 //       The Win32 clip region is saved in pHps->hrgnWin32Clip.
@@ -614 +614 @@
     }
 
-    if(hrgn == NULLHANDLE) 
-    {
-        if(pHps->hrgnWin32Clip != NULL) 
+    if(hrgn == NULLHANDLE)
+    {
+        if(pHps->hrgnWin32Clip != NULL)
         {
             //Only reset the path if both the visible and clip regions are zero
@@ -625 +625 @@
                 hrgnNewClip = NULLHANDLE;
             }
-            else 
+            else
             {//set PM clip region to Win32 visible region
                 lComplexity = GpiCombineRegion(pHps->hps, hrgnNewClip, pHps->hrgnWinVis, NULLHANDLE, CRGN_COPY);
@@ -661 +661 @@
         goto failure;
     }
-    // If there's no visible region (meaning entire DC is visible), then just set 
+    // If there's no visible region (meaning entire DC is visible), then just set
     // the GPI clip region to the win32 clip region
-    if (pHps->hrgnWinVis == NULLHANDLE) 
+    if (pHps->hrgnWinVis == NULLHANDLE)
     {
          lComplexity = GpiCombineRegion(pHps->hps, hrgnNewClip, hrgn, NULLHANDLE, CRGN_COPY);
@@ -704 +704 @@
 //
 // Parameters:
-// 
+//
 // pDCData pHps         - presentation space structure
 //
@@ -737 +737 @@
 //
 // Parameters:
-// 
+//
 // pDCData pHps         - presentation space structure
 // HRGN hrgn            - region handle (GPI)
@@ -753 +753 @@
 int WIN32API ExtSelectClipRgn(HDC hdc, HRGN hrgn, int mode)
 {
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN hrgn1 = hrgn;
 #endif
@@ -869 +869 @@
 }
 //******************************************************************************
-// The GetClipBox function retrieves the dimensions of the tightest bounding 
-// rectangle that can be drawn around the current visible area on the device. 
-// The visible area is defined by the current clipping region or clip path, as well 
+// The GetClipBox function retrieves the dimensions of the tightest bounding
+// rectangle that can be drawn around the current visible area on the device.
+// The visible area is defined by the current clipping region or clip path, as well
 // as any overlapping windows.
 //
@@ -954 +954 @@
    LONG       lComplexity = RGN_RECT;
    HRGN       hrgnClip = NULL, hrgnTemp;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN hrgn1 = hrgn;
 #endif
@@ -985 +985 @@
 }
 //******************************************************************************
-// The GetRandomRgn function copies the system clipping region of a specified 
+// The GetRandomRgn function copies the system clipping region of a specified
 // device context to a specific region.
 // It returns the visible region of the specified device context in screen
@@ -992 +992 @@
 // VALUE = 1: This undocumented value will return the current Clip Region contained in the DC.
 // VALUE = 2: This undocumented value will return the current Meta Region contained in the DC.
-// VALUE = 3: This undocumented value will return the intersection of the Clip Region and Meta Region. 
-// VALUE = 4, SYSRGN: The only value that is documented and defined for this function. 
+// VALUE = 3: This undocumented value will return the intersection of the Clip Region and Meta Region.
+// VALUE = 4, SYSRGN: The only value that is documented and defined for this function.
 //                    This value returns the System Region
 //******************************************************************************
@@ -1058 +1058 @@
 
     //Ok, success. Now update the cached win32 clip region
-    if(pHps->hrgnWin32Clip != NULLHANDLE) 
+    if(pHps->hrgnWin32Clip != NULLHANDLE)
     {
         HRGN hrgnClipRect = GpiCreateRegion(pHps->hps, 1, &rectl);
@@ -1124 +1124 @@
 
     //Ok, success. Now update the cached win32 clip region
-    if(pHps->hrgnWin32Clip != NULLHANDLE) 
+    if(pHps->hrgnWin32Clip != NULLHANDLE)
     {
         HRGN hrgnClipRect = GpiCreateRegion(pHps->hps, 1, &rectl);
@@ -1196 +1196 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API CreatePolyPolygonRgn(const POINT *lppt, const int *pPolyCount, 
+HRGN WIN32API CreatePolyPolygonRgn(const POINT *lppt, const int *pPolyCount,
                                    int  nCount, int fnPolyFillMode)
 {
@@ -1318 +1318 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API ExtCreateRegion(const XFORM_W * pXform, DWORD count, 
+HRGN WIN32API ExtCreateRegion(const XFORM_W * pXform, DWORD count,
                               const RGNDATA * pData)
 {
@@ -1522 +1522 @@
     ULONG lComplexity;
     LONG  mode;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN hrgn1 = hrgnDest;
    HRGN hrgn2 = hrgnSrc1;
@@ -1573 +1573 @@
 {
    LONG lEquality;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN hrgnt1 = hrgn1;
    HRGN hrgnt2 = hrgn2;
@@ -1604 +1604 @@
 {
    BOOL    result = FALSE;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN      hrgn1 = hrgn;
 #endif
@@ -1627 +1627 @@
 ULONG WIN32API GetRegionData( HRGN  hrgn, ULONG count, PRGNDATA pData)
 {
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN      hrgn1 = hrgn;
 #endif
@@ -1694 +1694 @@
    BOOL      success;
    LONG      lComplexity;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN      hrgn1 = hrgn;
 #endif
@@ -1729 +1729 @@
 BOOL WIN32API InvertRgn( HDC  hdc, HRGN  hrgn)
 {
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
     HRGN      hrgn1 = hrgn;
 #endif
@@ -1782 +1782 @@
 {
    LONG   lComplexity;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN      hrgn1 = hrgn;
 #endif
@@ -1830 +1830 @@
 {
     HBRUSH hbrushRestore = 0;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
     HRGN   hrgn1 = hrgn;
 #endif
@@ -1867 +1867 @@
         SelectObject(hdc, hbrushRestore);
 
-    if(lHits != GPI_ERROR) 
+    if(lHits != GPI_ERROR)
         DIBSECTION_MARK_INVALID(hdc);
 
@@ -1879 +1879 @@
  BOOL   success;
  HBRUSH hbrushRestore = 0;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
     HRGN   hrgn1 = hrgn;
 #endif
@@ -1934 +1934 @@
    BOOL      success;
    LONG      lInside;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN      hrgn1 = hrgn;
 #endif
@@ -1967 +1967 @@
    BOOL      success;
    LONG      lInside;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
    HRGN      hrgn1 = hrgn;
 #endif