Changeset 98691 in vbox

Timestamp:

Feb 22, 2023 3:05:54 PM (2 years ago)

Author:

vboxsync

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

155991

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Stuff related to saved VM info.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (3 diffs)
• UIMachine.h (modified) (2 diffs)
• UIMachineView.cpp (modified) (3 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)

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

@@ -480 +480 @@
 }
 
+bool UIMachine::acquireSavedGuestScreenInfo(ulong uScreenId,
+                                            long &xOrigin, long &yOrigin,
+                                            ulong &uWidth, ulong &uHeight, bool &fEnabled)
+{
+    return uisession()->acquireSavedGuestScreenInfo(uScreenId,
+                                                    xOrigin, yOrigin,
+                                                    uWidth, uHeight, fEnabled);
+}
+
 bool UIMachine::setVideoModeHint(ulong uScreenId, bool fEnabled, bool fChangeOrigin,
                                  long xOrigin, long yOrigin, ulong uWidth, ulong uHeight,
@@ -501 +510 @@
 {
     return uisession()->acquireScreenShot(uScreenId, uWidth, uHeight, enmFormat, pBits);
+}
+
+bool UIMachine::acquireSavedScreenshotInfo(ulong uScreenId, ulong &uWidth, ulong &uHeight, QVector<KBitmapFormat> &formats)
+{
+    return uisession()->acquireSavedScreenshotInfo(uScreenId, uWidth, uHeight, formats);
 }
 
@@ -1379 +1393 @@
         for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
         {
-            BOOL fEnabled = true;
-            ULONG uGuestOriginX = 0, uGuestOriginY = 0, uGuestWidth = 0, uGuestHeight = 0;
-            uisession()->machine().QuerySavedGuestScreenInfo(iScreenIndex,
-                                                             uGuestOriginX, uGuestOriginY,
-                                                             uGuestWidth, uGuestHeight, fEnabled);
+            long iDummy = 0;
+            ulong uDummy = 0;
+            bool fEnabled = true;
+            acquireSavedGuestScreenInfo(iScreenIndex, iDummy, iDummy, uDummy, uDummy, fEnabled);
             m_monitorVisibilityVector[iScreenIndex] = fEnabled;
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -303 +303 @@
                                           ulong &uWidth, ulong &uHeight, ulong &uBitsPerPixel,
                                           long &xOrigin, long &yOrigin, KGuestMonitorStatus &enmMonitorStatus);
+        /** Acquires saved info for guest-screen with passed uScreenId. */
+        bool acquireSavedGuestScreenInfo(ulong uScreenId,
+                                         long &xOrigin, long &yOrigin,
+                                         ulong &uWidth, ulong &uHeight, bool &fEnabled);
         /** Defines video mode hint for guest-screen with passed uScreenId. */
         bool setVideoModeHint(ulong uScreenId, bool fEnabled, bool fChangeOrigin,
@@ -313 +317 @@
         /** Acquires screen-shot for guest-screen with passed uScreenId. */
         bool acquireScreenShot(ulong uScreenId, ulong uWidth, ulong uHeight, KBitmapFormat enmFormat, uchar *pBits);
+        /** Acquires saved screen-shot info for guest-screen with passed uScreenId. */
+        bool acquireSavedScreenshotInfo(ulong uScreenId, ulong &uWidth, ulong &uHeight, QVector<KBitmapFormat> &formats);
         /** Notifies guest-screen with passed uScreenId about scale-factor change. */
         bool notifyScaleFactorChange(ulong uScreenId, ulong uScaleFactorWMultiplied, ulong uScaleFactorHMultiplied);

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

@@ -1283 +1283 @@
         if (enmActualState == KMachineState_Saved || enmActualState == KMachineState_AbortedSaved)
         {
-            ULONG uWidth = 0, uHeight = 0;
-            QVector<KBitmapFormat> formats = machine().QuerySavedScreenshotInfo(0, uWidth, uHeight);
+            ulong uWidth = 0, uHeight = 0;
+            QVector<KBitmapFormat> formats;
+            uimachine()->acquireSavedScreenshotInfo(m_uScreenId, uWidth, uHeight, formats);
             if (formats.size() > 0)
             {
@@ -1290 +1291 @@
                 size = QSize(uWidth, uHeight);
                 /* Try to get the real guest dimensions from the save-state: */
-                ULONG uGuestOriginX = 0, uGuestOriginY = 0, uGuestWidth = 0, uGuestHeight = 0;
-                BOOL fEnabled = true;
-                machine().QuerySavedGuestScreenInfo(m_uScreenId, uGuestOriginX, uGuestOriginY, uGuestWidth, uGuestHeight, fEnabled);
+                long iDummy = 0;
+                ulong uGuestWidth = 0, uGuestHeight = 0;
+                bool fDummy = true;
+                uimachine()->acquireSavedGuestScreenInfo(m_uScreenId,
+                                                         iDummy, iDummy,
+                                                         uGuestWidth, uGuestHeight, fDummy);
                 if (uGuestWidth  > 0 && uGuestHeight > 0)
                     size = QSize(uGuestWidth, uGuestHeight);
@@ -1635 +1639 @@
 
     /* Acquire the screen-data properties from the saved-state: */
-    ULONG uGuestOriginX = 0, uGuestOriginY = 0, uGuestWidth = 0, uGuestHeight = 0;
-    BOOL fEnabled = true;
-    machine().QuerySavedGuestScreenInfo(m_uScreenId, uGuestOriginX, uGuestOriginY, uGuestWidth, uGuestHeight, fEnabled);
+    long iDummy = 0;
+    ulong uGuestWidth = 0, uGuestHeight = 0;
+    bool fDummy = true;
+    uimachine()->acquireSavedGuestScreenInfo(m_uScreenId, iDummy, iDummy, uGuestWidth, uGuestHeight, fDummy);
 
     /* Calculate effective size: */

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

@@ -768 +768 @@
 }
 
+bool UISession::acquireSavedGuestScreenInfo(ulong uScreenId,
+                                            long &xOrigin, long &yOrigin,
+                                            ulong &uWidth, ulong &uHeight, bool &fEnabled)
+{
+    CMachine comMachine = machine();
+    ULONG uGuestXOrigin = 0, uGuestYOrigin = 0, uGuestWidth = 0, uGuestHeight = 0;
+    BOOL fGuestEnabled = FALSE;
+    comMachine.QuerySavedGuestScreenInfo(uScreenId, uGuestXOrigin, uGuestYOrigin, uGuestWidth, uGuestHeight, fGuestEnabled);
+    const bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        xOrigin = uGuestXOrigin;
+        yOrigin = uGuestYOrigin;
+        uWidth = uGuestWidth;
+        uHeight = uGuestHeight;
+        fEnabled = fGuestEnabled == TRUE;
+    }
+    return fSuccess;
+}
+
 bool UISession::setVideoModeHint(ulong uScreenId, bool fEnabled, bool fChangeOrigin, long xOrigin, long yOrigin,
                                  ulong uWidth, ulong uHeight, ulong uBitsPerPixel, bool fNotify)
@@ -834 +856 @@
         if (!fSuccess)
             UINotificationMessage::cannotAcquireDisplayParameter(comDisplay);
+    }
+    return fSuccess;
+}
+
+bool UISession::acquireSavedScreenshotInfo(ulong uScreenId, ulong &uWidth, ulong &uHeight, QVector<KBitmapFormat> &formats)
+{
+    CMachine comMachine = machine();
+    ULONG uGuestWidth = 0, uGuestHeight = 0;
+    QVector<KBitmapFormat> guestFormats = comMachine.QuerySavedScreenshotInfo(uScreenId, uGuestWidth, uGuestHeight);
+    const bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        uWidth = uGuestWidth;
+        uHeight = uGuestHeight;
+        formats = guestFormats;
     }
     return fSuccess;

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

@@ -350 +350 @@
                                           ulong &uWidth, ulong &uHeight, ulong &uBitsPerPixel,
                                           long &xOrigin, long &yOrigin, KGuestMonitorStatus &enmMonitorStatus);
+        /** Acquires saved info for guest-screen with passed uScreenId. */
+        bool acquireSavedGuestScreenInfo(ulong uScreenId,
+                                         long &xOrigin, long &yOrigin,
+                                         ulong &uWidth, ulong &uHeight, bool &fEnabled);
         /** Defines video mode hint for guest-screen with passed uScreenId. */
         bool setVideoModeHint(ulong uScreenId, bool fEnabled, bool fChangeOrigin,
@@ -360 +364 @@
         /** Acquires screen-shot for guest-screen with passed uScreenId. */
         bool acquireScreenShot(ulong uScreenId, ulong uWidth, ulong uHeight, KBitmapFormat enmFormat, uchar *pBits);
+        /** Acquires saved screen-shot info for guest-screen with passed uScreenId. */
+        bool acquireSavedScreenshotInfo(ulong uScreenId, ulong &uWidth, ulong &uHeight, QVector<KBitmapFormat> &formats);
         /** Notifies guest-screen with passed uScreenId about scale-factor change. */
         bool notifyScaleFactorChange(ulong uScreenId, ulong uScaleFactorWMultiplied, ulong uScaleFactorHMultiplied);