Changeset 95964 in vbox

Timestamp:

Aug 1, 2022 2:20:48 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152721

Message:

Additions/VBoxTray: Got rid of DDCLOG() -- use LogXFunc or similar instead. We already have too many custom logging and #ifdefs hells already.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxHelpers.cpp (modified) (10 diffs)
• VBoxHelpers.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.cpp

@@ -117 +117 @@
                    int iNewPosX, int iNewPosY)
 {
-    DDCLOG(("nRects %d, iPrimary %d, iResized %d, NewWidth %d, NewHeight %d\n", nRects, uPrimary, uResized, iNewWidth, iNewHeight));
+    Log4Func(("nRects %d, iPrimary %d, iResized %d, NewWidth %d, NewHeight %d\n", nRects, uPrimary, uResized, iNewWidth, iNewHeight));
 
     RECTL *paNewRects = (RECTL *)alloca (sizeof (RECTL) * nRects);
@@ -140 +140 @@
         /* Find the next adjacent original rect in x positive direction. */
         unsigned iNextRect = hlpNextAdjacentRectXP(paRects, nRects, iRect);
-        DDCLOG(("next %d -> %d\n", iRect, iNextRect));
+        Log4Func(("next %d -> %d\n", iRect, iNextRect));
 
         if (iNextRect == ~0 || iNextRect == uPrimary)
@@ -154 +154 @@
         if (delta != 0)
         {
-            DDCLOG(("XP intersection right %d left %d, diff %d\n",
-                     paNewRects[iRect].right, paNewRects[iNextRect].left,
-                     delta));
+            Log4Func(("XP intersection right %d left %d, diff %d\n",
+                      paNewRects[iRect].right, paNewRects[iNextRect].left,
+                      delta));
 
             paNewRects[iNextRect].left += delta;
@@ -168 +168 @@
         /* Find the next adjacent original rect in x negative direction. */
         unsigned iNextRect = hlpNextAdjacentRectXN(paRects, nRects, iRect);
-        DDCLOG(("next %d -> %d\n", iRect, iNextRect));
+        Log4Func(("next %d -> %d\n", iRect, iNextRect));
 
         if (iNextRect == ~0 || iNextRect == uPrimary)
@@ -182 +182 @@
         if (delta != 0)
         {
-            DDCLOG(("XN intersection left %d right %d, diff %d\n",
-                     paNewRects[iRect].left, paNewRects[iNextRect].right,
-                     delta));
+            Log4Func(("XN intersection left %d right %d, diff %d\n",
+                      paNewRects[iRect].left, paNewRects[iNextRect].right,
+                      delta));
 
             paNewRects[iNextRect].left += delta;
@@ -196 +196 @@
         /* Find the next adjacent original rect in y positive direction. */
         unsigned iNextRect = hlpNextAdjacentRectYP(paRects, nRects, iRect);
-        DDCLOG(("next %d -> %d\n", iRect, iNextRect));
+        Log4Func(("next %d -> %d\n", iRect, iNextRect));
 
         if (iNextRect == ~0 || iNextRect == uPrimary)
@@ -210 +210 @@
         if (delta != 0)
         {
-            DDCLOG(("YP intersection bottom %d top %d, diff %d\n",
-                     paNewRects[iRect].bottom, paNewRects[iNextRect].top,
-                     delta));
+            Log4Func(("YP intersection bottom %d top %d, diff %d\n",
+                      paNewRects[iRect].bottom, paNewRects[iNextRect].top,
+                      delta));
 
             paNewRects[iNextRect].top += delta;
@@ -224 +224 @@
         /* Find the next adjacent original rect in x negative direction. */
         unsigned iNextRect = hlpNextAdjacentRectYN(paRects, nRects, iRect);
-        DDCLOG(("next %d -> %d\n", iRect, iNextRect));
+        Log4Func(("next %d -> %d\n", iRect, iNextRect));
 
         if (iNextRect == ~0 || iNextRect == uPrimary)
@@ -238 +238 @@
         if (delta != 0)
         {
-            DDCLOG(("YN intersection top %d bottom %d, diff %d\n",
-                     paNewRects[iRect].top, paNewRects[iNextRect].bottom,
-                     delta));
+            Log4Func(("YN intersection top %d bottom %d, diff %d\n",
+                      paNewRects[iRect].top, paNewRects[iNextRect].bottom,
+                      delta));
 
             paNewRects[iNextRect].top += delta;
@@ -256 +256 @@
         paRects[iRect].top    = paNewRects[iRect].top    - iOffsetY;
         paRects[iRect].bottom = paNewRects[iRect].bottom - iOffsetY;
-        DDCLOG((" [%d]: %d,%d %dx%d -> %d,%d %dx%d%s\n",
-                iRect,
-                paRects[iRect].left, paRects[iRect].top,
-                paRects[iRect].right - paRects[iRect].left,
-                paRects[iRect].bottom - paRects[iRect].top,
-                paNewRects[iRect].left, paNewRects[iRect].top,
-                paNewRects[iRect].right - paNewRects[iRect].left,
-                paNewRects[iRect].bottom - paNewRects[iRect].top,
-                iRect == uPrimary? " <- primary": ""));
+        Log4Func((" [%d]: %d,%d %dx%d -> %d,%d %dx%d%s\n",
+                  iRect,
+                  paRects[iRect].left, paRects[iRect].top,
+                  paRects[iRect].right - paRects[iRect].left,
+                  paRects[iRect].bottom - paRects[iRect].top,
+                  paNewRects[iRect].left, paNewRects[iRect].top,
+                  paNewRects[iRect].right - paNewRects[iRect].left,
+                  paNewRects[iRect].bottom - paNewRects[iRect].top,
+                  iRect == uPrimary? " <- primary": ""));
     }
     return;

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHelpers.h

@@ -22 +22 @@
 #endif
 
-// #define DEBUG_DISPLAY_CHANGE
-
-/** @todo r=andy WTF? Remove this!! */
-#ifdef DEBUG_DISPLAY_CHANGE
-#   define DDCLOG(a) Log(a)
-#else
-#   define DDCLOG(a) do {} while (0)
-#endif /* !DEBUG_DISPLAY_CHANGE */
-
 extern int  hlpReportStatus(VBoxGuestFacilityStatus statusCurrent);
 extern void hlpReloadCursor(void);