Changeset 76603 in vbox

Timestamp:

Jan 2, 2019 4:35:58 AM (6 years ago)

Author:

vboxsync

Message:

UIDefs.h: Drop SIZEOF_ARRAY as we've got RT_ELEMENTS for that. Assertions shall be active when RT/VBOX_STRICT is defined rather than when DEBUG is.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.h (modified) (3 diffs)
• runtime/UIKeyboardHandler.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -22 +22 @@
 #endif
 
+/* Define GUI log group: */
+// WORKAROUND:
+// This define should go *before* VBox/log.h include!
+#define LOG_GROUP LOG_GROUP_GUI
+
 /* Qt includes: */
 #include <QEvent>
@@ -32 +37 @@
 #include "COMEnums.h"
 
-/* Define GUI log group: */
-// WORKAROUND:
-// This define should go *before* VBox/log.h include!
-#ifndef VBOX_WITH_PRECOMPILED_HEADERS
-# define LOG_GROUP LOG_GROUP_GUI
-#endif
-
 /* Other VBox includes: */
 #include <VBox/log.h>
@@ -44 +42 @@
 
 /* Defines: */
-#ifdef DEBUG
-# define AssertWrapperOk(w)      \
-    AssertMsg (w.isOk(), (#w " is not okay (RC=0x%08X)", w.lastRC()))
-# define AssertWrapperOkMsg(w, m)      \
-    AssertMsg (w.isOk(), (#w ": " m " (RC=0x%08X)", w.lastRC()))
-#else /* !DEBUG */
-# define AssertWrapperOk(w)          do {} while (0)
-# define AssertWrapperOkMsg(w, m)    do {} while (0)
-#endif /* !DEBUG */
-
-#ifndef SIZEOF_ARRAY
-# define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0]))
+#ifdef RT_STRICT
+# define AssertWrapperOk(w)         AssertMsg(w.isOk(), (#w " is not okay (RC=0x%08X)", w.lastRC()))
+# define AssertWrapperOkMsg(w, m)   AssertMsg(w.isOk(), (#w ": " m " (RC=0x%08X)", w.lastRC()))
+#else
+# define AssertWrapperOk(w)         do {} while (0)
+# define AssertWrapperOkMsg(w, m)   do {} while (0)
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -404 +404 @@
      * a sequence of all modifier keys contained in the host sequence, hoping
      * that the user will choose something which the guest does not interpret. */
-    for (uint i = 0; i < SIZEOF_ARRAY (m_pressedKeys); i++)
+    for (uint i = 0; i < RT_ELEMENTS(m_pressedKeys); i++)
     {
         if ((m_pressedKeys[i] & IsKeyPressed) || (m_pressedKeys[i] & IsExtKeyPressed))
@@ -1626 +1626 @@
                 static LONG PrintMake[] = { 0xE0, 0x2A, 0xE0, 0x37 };
                 pCodes = PrintMake;
-                uCodesCount = SIZEOF_ARRAY(PrintMake);
+                uCodesCount = RT_ELEMENTS(PrintMake);
             }
             else
@@ -1632 +1632 @@
                 static LONG PrintBreak[] = { 0xE0, 0xB7, 0xE0, 0xAA };
                 pCodes = PrintBreak;
-                uCodesCount = SIZEOF_ARRAY(PrintBreak);
+                uCodesCount = RT_ELEMENTS(PrintBreak);
             }
         }
@@ -1642 +1642 @@
                 static LONG Pause[] = { 0xE1, 0x1D, 0x45, 0xE1, 0x9D, 0xC5 };
                 pCodes = Pause;
-                uCodesCount = SIZEOF_ARRAY(Pause);
+                uCodesCount = RT_ELEMENTS(Pause);
             }
             else
@@ -1857 +1857 @@
 {
     QVector <LONG> codes(2);
-    for (uint i = 0; i < SIZEOF_ARRAY(m_pressedKeys); ++ i)
+    for (uint i = 0; i < RT_ELEMENTS(m_pressedKeys); ++ i)
     {
         uint8_t os = m_pressedKeysCopy[i];