Changeset 98686 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 22, 2023 2:45:22 PM (2 years ago)

Author:

vboxsync

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

155986

Message:

FE/Qt: bugref:10322: Runtime UI: Small cleanup and fixes for UISession COM wrappers.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (6 diffs)

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

@@ -262 +262 @@
 {
     CMachine comMachine = machine();
-    KMachineState enmMachineState = comMachine.GetState();
+    const KMachineState enmMachineState = comMachine.GetState();
     const bool fSuccess = comMachine.isOk();
     if (!fSuccess)
@@ -719 +719 @@
             UINotificationMessage::cannotAcquireGraphicsAdapterParameter(comAdapter);
         else
-            fEnabled = fAccelerate3DEnabeld;
+            fEnabled = fAccelerate3DEnabeld == TRUE;
     }
     return fSuccess;
@@ -756 +756 @@
     if (!fSuccess)
         UINotificationMessage::cannotAcquireDisplayParameter(comDisplay);
-    uWidth = uGuestWidth;
-    uHeight = uGuestHeight;
-    uBitsPerPixel = uGuestBitsPerPixel;
-    xOrigin = iGuestXOrigin;
-    yOrigin = iGuestYOrigin;
-    enmMonitorStatus = enmGuestMonitorStatus;
+    else
+    {
+        uWidth = uGuestWidth;
+        uHeight = uGuestHeight;
+        uBitsPerPixel = uGuestBitsPerPixel;
+        xOrigin = iGuestXOrigin;
+        yOrigin = iGuestYOrigin;
+        enmMonitorStatus = enmGuestMonitorStatus;
+    }
     return fSuccess;
 }
@@ -782 +785 @@
 {
     CDisplay comDisplay = display();
-    BOOL fGuestEnabled = false, fGuestChangeOrigin = false;
+    BOOL fGuestEnabled = FALSE, fGuestChangeOrigin = FALSE;
     LONG iGuestXOrigin = 0, iGuestYOrigin = 0;
     ULONG uGuestWidth = 0, uGuestHeight = 0, uGuestBitsPerPixel = 0;
@@ -791 +794 @@
     if (!fSuccess)
         UINotificationMessage::cannotAcquireDisplayParameter(comDisplay);
-    fEnabled = fGuestEnabled;
-    fChangeOrigin = fGuestChangeOrigin;
-    xOrigin = iGuestXOrigin;
-    yOrigin = iGuestYOrigin;
-    uWidth = uGuestWidth;
-    uHeight = uGuestHeight;
-    uBitsPerPixel = uGuestBitsPerPixel;
+    else
+    {
+        fEnabled = fGuestEnabled == TRUE;
+        fChangeOrigin = fGuestChangeOrigin == TRUE;
+        xOrigin = iGuestXOrigin;
+        yOrigin = iGuestYOrigin;
+        uWidth = uGuestWidth;
+        uHeight = uGuestHeight;
+        uBitsPerPixel = uGuestBitsPerPixel;
+    }
     return fSuccess;
 }
@@ -895 +901 @@
 {
     CConsole comConsole = console();
-    states = comConsole.GetDeviceActivity(deviceTypes);
+    const QVector<KDeviceActivity> currentStates = comConsole.GetDeviceActivity(deviceTypes);
     const bool fSuccess = comConsole.isOk();
     if (!fSuccess)
         UINotificationMessage::cannotAcquireConsoleParameter(comConsole);
+    else
+        states = currentStates;
     return fSuccess;
 }