Changeset 76394 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 23, 2018 2:14:05 AM (6 years ago)

Author:

vboxsync

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

127693

Message:

DisplayImpl.h,HGCM.h: Avoid including VBox/VMMDev.h and instead do it the handful of source files where it's actually needed. bugref:9344

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• DisplayImpl.cpp (modified) (1 diff)
• DisplayImplLegacy.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -1177 +1177 @@
             /** @todo r=dj locking required here for m_pVMMDev? */
             PPDMIVMMDEVPORT pDevPort;
-            if (    (m_pVMMDev)
+            if (    m_pVMMDev
                  && ((pDevPort = m_pVMMDev->getVMMDevPort()))
                )
@@ -1195 +1195 @@
                     if (RT_SUCCESS(rc))
                     {
-                        switch (u32GuestFlags & (VMMDEV_CREDENTIALS_JUDGE_OK | VMMDEV_CREDENTIALS_JUDGE_DENY |
-                                                 VMMDEV_CREDENTIALS_JUDGE_NOJUDGEMENT))
+                        switch (u32GuestFlags & (  VMMDEV_CREDENTIALS_JUDGE_OK
+                                                 | VMMDEV_CREDENTIALS_JUDGE_DENY
+                                                 | VMMDEV_CREDENTIALS_JUDGE_NOJUDGEMENT))
                         {
                             case VMMDEV_CREDENTIALS_JUDGE_DENY:        guestJudgement = AuthGuestAccessDenied;  break;
@@ -1202 +1203 @@
                             case VMMDEV_CREDENTIALS_JUDGE_OK:          guestJudgement = AuthGuestAccessGranted; break;
                             default:
-                                LogFlowFunc(("Invalid guest flags %08X!!!\n", u32GuestFlags)); break;
+                                LogFlowFunc(("Invalid guest flags %#08x!!!\n", u32GuestFlags)); break;
                         }
                     }

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -42 +42 @@
 # include <VBox/vmm/vm.h>
 #endif
+#include <VBox/VMMDev.h>
 
 #ifdef VBOX_WITH_VIDEOHWACCEL

trunk/src/VBox/Main/src-client/DisplayImplLegacy.cpp

@@ -26 +26 @@
 #include "ConsoleVRDPServer.h"
 #include "VMMDev.h"
+#include <VBox/VMMDev.h>
 
 /* generated header */