Changeset 98699 in vbox

Timestamp:

Feb 23, 2023 9:43:09 AM (2 years ago)

Author:

vboxsync

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

155999

Message:

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

Location:

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

Files:

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

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

@@ -515 +515 @@
 {
     return uisession()->acquireSavedScreenshotInfo(uScreenId, uWidth, uHeight, formats);
+}
+
+bool UIMachine::acquireSavedScreenshot(ulong uScreenId, KBitmapFormat enmFormat,
+                                       ulong &uWidth, ulong &uHeight, QVector<BYTE> &screenshot)
+{
+    return uisession()->acquireSavedScreenshot(uScreenId, enmFormat,
+                                               uWidth, uHeight, screenshot);
 }
 

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

@@ -319 +319 @@
         /** Acquires saved screen-shot info for guest-screen with passed uScreenId. */
         bool acquireSavedScreenshotInfo(ulong uScreenId, ulong &uWidth, ulong &uHeight, QVector<KBitmapFormat> &formats);
+        /** Acquires saved screen-shot for guest-screen with passed uScreenId. */
+        bool acquireSavedScreenshot(ulong uScreenId, KBitmapFormat enmFormat,
+                                    ulong &uWidth, ulong &uHeight, QVector<BYTE> &screenshot);
         /** 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

@@ -1631 +1631 @@
 {
     /* Acquire the screen-data from the saved-state: */
-    ULONG uWidth = 0, uHeight = 0;
-    const QVector<BYTE> screenData = machine().ReadSavedScreenshotToArray(0, KBitmapFormat_PNG, uWidth, uHeight);
-
-    /* Make sure there is saved-state screen-data: */
+    ulong uDummy = 0;
+    QVector<BYTE> screenData;
+    uimachine()->acquireSavedScreenshot(m_uScreenId, KBitmapFormat_PNG, uDummy, uDummy, screenData);
     if (screenData.isEmpty())
         return;
@@ -1656 +1655 @@
 
     /* Dim screen-shot if it is Ok: */
-    if (machine().isOk() && !screenShot.isNull())
+    if (!screenShot.isNull())
         dimImage(screenShot);
 

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

@@ -877 +877 @@
 }
 
+bool UISession::acquireSavedScreenshot(ulong uScreenId, KBitmapFormat enmFormat,
+                                       ulong &uWidth, ulong &uHeight, QVector<BYTE> &screenshot)
+{
+    CMachine comMachine = machine();
+    ULONG uGuestWidth = 0, uGuestHeight = 0;
+    const QVector<BYTE> guestScreenshot = comMachine.ReadSavedScreenshotToArray(uScreenId, enmFormat,
+                                                                                uGuestWidth, uGuestHeight);
+    const bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        uWidth = uGuestWidth;
+        uHeight = uGuestHeight;
+        screenshot = guestScreenshot;
+    }
+    return fSuccess;
+}
+
 bool UISession::notifyScaleFactorChange(ulong uScreenId, ulong uScaleFactorWMultiplied, ulong uScaleFactorHMultiplied)
 {

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

@@ -366 +366 @@
         /** Acquires saved screen-shot info for guest-screen with passed uScreenId. */
         bool acquireSavedScreenshotInfo(ulong uScreenId, ulong &uWidth, ulong &uHeight, QVector<KBitmapFormat> &formats);
+        /** Acquires saved screen-shot for guest-screen with passed uScreenId. */
+        bool acquireSavedScreenshot(ulong uScreenId, KBitmapFormat enmFormat,
+                                    ulong &uWidth, ulong &uHeight, QVector<BYTE> &screenshot);
         /** Notifies guest-screen with passed uScreenId about scale-factor change. */
         bool notifyScaleFactorChange(ulong uScreenId, ulong uScaleFactorWMultiplied, ulong uScaleFactorHMultiplied);