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

Timestamp:

Sep 1, 2021 7:26:19 PM (3 years ago)

Author:

vboxsync

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

146729

Message:

FE/Qt: bugref:10067: Moving Windows stuff from UICommon to VBoxUtils-win.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (6 diffs)
• globals/UICommon.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• manager/UIVirtualMachineItemLocal.cpp (modified) (1 diff)
• manager/UIVirtualMachineItemLocal.h (modified) (1 diff)
• platform/win/VBoxUtils-win.cpp (modified) (1 diff)
• platform/win/VBoxUtils-win.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -39 +39 @@
 #include <QTranslator>
 #ifdef VBOX_WS_WIN
-# include <QEventLoop>
 # include <QStyleFactory>
 #endif
@@ -80 +79 @@
 # include "VBoxUtils-darwin.h"
 #endif
+#ifdef VBOX_WS_WIN
+# include "VBoxUtils-win.h"
+#endif
 #ifdef VBOX_WS_X11
 # include "UIHostComboEditor.h"
@@ -128 +130 @@
 #include <VBox/vd.h>
 #include <VBox/com/Guid.h>
-#ifdef VBOX_WS_WIN
-# include <iprt/win/shlobj.h>
-#endif
 
 /* VirtualBox interface declarations: */
@@ -1565 +1564 @@
 bool UICommon::activateWindow(WId wId, bool fSwitchDesktop /* = true */)
 {
-    RT_NOREF(fSwitchDesktop);
+    Q_UNUSED(fSwitchDesktop);
     bool fResult = true;
 
 #if defined(VBOX_WS_WIN)
 
-    HWND handle = (HWND)wId;
-
-    if (IsIconic(handle))
-        fResult &= !!ShowWindow(handle, SW_RESTORE);
-    else if (!IsWindowVisible(handle))
-        fResult &= !!ShowWindow(handle, SW_SHOW);
-
-    fResult &= !!SetForegroundWindow(handle);
+    fResult &= NativeWindowSubsystem::WinActivateWindow(wId, fSwitchDesktop);
 
 #elif defined(VBOX_WS_X11)
 
-    return NativeWindowSubsystem::X11ActivateWindow(wId, fSwitchDesktop);
+    fResult &= NativeWindowSubsystem::X11ActivateWindow(wId, fSwitchDesktop);
 
 #else
@@ -3395 +3387 @@
                 // In theory that's Qt5 who should allow us to provide canceling reason as well, but that functionality
                 // seems to be missed in Windows platform plugin, so we are making that ourselves.
-                ShutdownBlockReasonCreateAPI((HWND)windowManager().mainWindowShown()->winId(), L"VM is still running.");
+                NativeWindowSubsystem::ShutdownBlockReasonCreateAPI((HWND)windowManager().mainWindowShown()->winId(), L"VM is still running.");
 #endif
             }
@@ -3467 +3459 @@
     emit sigVBoxSVCAvailabilityChange();
 }
-
-#ifdef VBOX_WS_WIN
-/* static */
-BOOL UICommon::ShutdownBlockReasonCreateAPI(HWND hWnd, LPCWSTR pwszReason)
-{
-    BOOL fResult = FALSE;
-    typedef BOOL(WINAPI *PFNSHUTDOWNBLOCKREASONCREATE)(HWND hWnd, LPCWSTR pwszReason);
-
-    PFNSHUTDOWNBLOCKREASONCREATE pfn = (PFNSHUTDOWNBLOCKREASONCREATE)GetProcAddress(
-        GetModuleHandle(L"User32.dll"), "ShutdownBlockReasonCreate");
-    _ASSERTE(pfn);
-    if (pfn)
-        fResult = pfn(hWnd, pwszReason);
-    return fResult;
-}
-#endif
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

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

@@ -683 +683 @@
                                 const QString &strMachineName = QString(),
                                 const QString &strMachineGuestOSTypeId = QString());
-    /** @} */
-
-    /** @name Common stuff.
-     * @{ */
-#ifdef VBOX_WS_WIN
-        /** Wraps WinAPI ShutdownBlockReasonCreate function. */
-        static BOOL ShutdownBlockReasonCreateAPI(HWND hWnd, LPCWSTR pwszReason);
-#endif
     /** @} */
 
@@ -886 +878 @@
     /** @} */
 
-#if defined(VBOX_WS_WIN)
+#ifdef VBOX_WS_WIN
     /** @name ATL stuff.
      * @{ */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -2485 +2485 @@
         && comMachine.CanShowConsoleWindow())
     {
-        uiCommon().switchToMachine(comMachine);
+        UICommon::switchToMachine(comMachine);
         return;
     }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemLocal.cpp

@@ -168 +168 @@
 }
 
-bool UIVirtualMachineItemLocal::switchTo()
-{
-#ifdef VBOX_WS_MAC
-    ULONG64 id = m_comMachine.ShowConsoleWindow();
-#else
-    WId id = (WId) m_comMachine.ShowConsoleWindow();
-#endif
-    AssertWrapperOk(m_comMachine);
-    if (!m_comMachine.isOk())
-        return false;
-
-    /* winId = 0 it means the console window has already done everything
-     * necessary to implement the "show window" semantics. */
-    if (id == 0)
-        return true;
-
-#if defined (VBOX_WS_WIN) || defined (VBOX_WS_X11)
-
-    return uiCommon().activateWindow(id, true);
-
-#elif defined (VBOX_WS_MAC)
-
-    // WORKAROUND:
-    // This is just for the case were the other process cannot steal
-    // the focus from us. It will send us a PSN so we can try.
-    ProcessSerialNumber psn;
-    psn.highLongOfPSN = id >> 32;
-    psn.lowLongOfPSN = (UInt32)id;
-    OSErr rc = ::SetFrontProcess(&psn);
-    if (!rc)
-        Log(("GUI: %#RX64 couldn't do SetFrontProcess on itself, the selector (we) had to do it...\n", id));
-    else
-        Log(("GUI: Failed to bring %#RX64 to front. rc=%#x\n", id, rc));
-    return !rc;
-
-#else
-
-    return false;
-
-#endif
-}
-
 bool UIVirtualMachineItemLocal::isItemEditable() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemLocal.h

@@ -73 +73 @@
         /** Returns cached session state name. */
         QString sessionStateName() const { return m_strSessionStateName; }
-    /** @} */
-
-    /** @name Console attributes.
-      * @{ */
-        /** Tries to switch to the main window of the VM process.
-          * @return true if switched successfully. */
-        bool switchTo();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.cpp

@@ -91 +91 @@
 }
 
+BOOL NativeWindowSubsystem::ShutdownBlockReasonCreateAPI(HWND hWnd, LPCWSTR pwszReason)
+{
+    BOOL fResult = FALSE;
+    typedef BOOL(WINAPI *PFNSHUTDOWNBLOCKREASONCREATE)(HWND hWnd, LPCWSTR pwszReason);
+
+    PFNSHUTDOWNBLOCKREASONCREATE pfn = (PFNSHUTDOWNBLOCKREASONCREATE)GetProcAddress(
+        GetModuleHandle(L"User32.dll"), "ShutdownBlockReasonCreate");
+    _ASSERTE(pfn);
+    if (pfn)
+        fResult = pfn(hWnd, pwszReason);
+    return fResult;
+}
+
+bool NativeWindowSubsystem::WinActivateWindow(WId wId, bool)
+{
+    bool fResult = true;
+    HWND handle = (HWND)wId;
+
+    if (IsIconic(handle))
+        fResult &= !!ShowWindow(handle, SW_RESTORE);
+    else if (!IsWindowVisible(handle))
+        fResult &= !!ShowWindow(handle, SW_SHOW);
+
+    fResult &= !!SetForegroundWindow(handle);
+    return fResult;
+}

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.h

@@ -37 +37 @@
     SHARED_LIBRARY_STUFF const QRegion areaCoveredByTopMostWindows();
     SHARED_LIBRARY_STUFF const void setScreenSaverActive(BOOL fDisableScreenSaver);
+
+    /** Wraps WinAPI ShutdownBlockReasonCreate function. */
+    SHARED_LIBRARY_STUFF BOOL ShutdownBlockReasonCreateAPI(HWND hWnd, LPCWSTR pwszReason);
+
+    /** Activates window with certain @a wId, @a fSwitchDesktop if requested. */
+    bool WinActivateWindow(WId wId, bool fSwitchDesktop);
 }