Changeset 64160 in vbox for trunk/src

Timestamp:

Oct 6, 2016 12:03:52 PM (8 years ago)

Author:

vboxsync

Message:

VBoxFrontends: fix for bugref:8161: added shutdown events handling to VirtualBox UI

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/globals/VBoxGlobal.h (modified) (2 diffs)
• Frontends/VirtualBox/src/runtime/UISession.h (modified) (1 diff)
• Main/src-server/win/svcmain.cpp (modified) (7 diffs)

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

@@ -147 +147 @@
 #include <QSettings>
 #include <QStyleOptionSpinBox>
+#include <QSessionManager>
 
 /* Other VBox includes: */
@@ -3899 +3900 @@
     /* Make sure QApplication cleanup us on exit: */
     connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(cleanup()));
+    /* Make sure we handle host OS session shutdown as well: */
+    connect(qApp, SIGNAL(commitDataRequest(QSessionManager &)),
+            this, SLOT(sltHandleCommitDataRequest(QSessionManager &)));
 
 #ifdef VBOX_WS_MAC
@@ -4413 +4417 @@
 }
 
+#ifdef VBOX_WS_WIN
+/* static */
+BOOL VBoxGlobal::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
+
+void VBoxGlobal::sltHandleCommitDataRequest(QSessionManager &manager)
+{
+    LogRel(("GUI: VBoxGlobal::sltHandleCommitDataRequest: Emergency shutdown initiated\n"));
+
+    /* For VM process: */
+    if (vboxGlobal().isVMConsoleProcess())
+    {
+        /* Temporary override the default close action to 'SaveState' if necessary: */
+        if (gpMachine->uisession()->defaultCloseAction() == MachineCloseAction_Invalid)
+            gpMachine->uisession()->setDefaultCloseAction(MachineCloseAction_SaveState);
+    }
+
+    /* Ask session manager to postpone shutdown until we done: */
+    manager.cancel();
+
+#ifdef VBOX_WS_WIN
+    // WORKAROUND:
+    // In theory that's Qt5 who should allow us to provide postponing reason as well,
+    // but that functionality seems missed in Windows platform plugin, so we are making that ourselves.
+    // That also implies that since we had postponed a shutdown process, host will send us WM_QUIT to
+    // allow to properly do an application cleanup first. That signal will cause QApplication to quit().
+    ShutdownBlockReasonCreateAPI((HWND)windowManager().mainWindowShown()->winId(), L"Shutdown in progress...");
+#endif
+}
+
 void VBoxGlobal::sltHandleVBoxSVCAvailabilityChange(bool fAvailable)
 {

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

@@ -469 +469 @@
     void cleanup();
 
+    /** Handles @a manager request for emergency session shutdown. */
+    void sltHandleCommitDataRequest(QSessionManager &manager);
+
     /** Shows UI. */
     void showUI();
@@ -487 +490 @@
     /** Re-initializes COM wrappers and containers. */
     void comWrappersReinit();
+
+#ifdef VBOX_WS_WIN
+    /** Wraps WinAPI ShutdownBlockReasonCreate function.
+      * @remark  This function defined starting from Vista only. */
+    static BOOL ShutdownBlockReasonCreateAPI(HWND hWnd, LPCWSTR pwszReason);
+#endif
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

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

@@ -146 +146 @@
     /** @name Application Close configuration stuff.
      * @{ */
+    /** Defines @a defaultCloseAction. */
+    void setDefaultCloseAction(MachineCloseAction defaultCloseAction) { m_defaultCloseAction = defaultCloseAction; }
     /** Returns default close action. */
     MachineCloseAction defaultCloseAction() const { return m_defaultCloseAction; }

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -155 +155 @@
 BOOL ShutdownBlockReasonCreateAPI(HWND hWnd,LPCWSTR pwszReason)
 {
-    BOOL result = FALSE;
+    BOOL fResult = FALSE;
     typedef BOOL(WINAPI *PFNSHUTDOWNBLOCKREASONCREATE)(HWND hWnd, LPCWSTR pwszReason);
 
@@ -162 +162 @@
     _ASSERTE(pfn);
     if (pfn)
-        result = pfn(hWnd, pwszReason);
-    return result;
+        fResult = pfn(hWnd, pwszReason);
+    return fResult;
 }
 
@@ -172 +172 @@
 BOOL ShutdownBlockReasonDestroyAPI(HWND hWnd)
 {
-    BOOL result = FALSE;
+    BOOL fResult = FALSE;
     typedef BOOL(WINAPI *PFNSHUTDOWNBLOCKREASONDESTROY)(HWND hWnd);
 
@@ -179 +179 @@
     _ASSERTE(pfn);
     if (pfn)
-        result = pfn(hWnd);
-    return result;
+        fResult = pfn(hWnd);
+    return fResult;
 }
 
@@ -198 +198 @@
             /* decrease a latency of MonitorShutdown loop */
             ASMAtomicXchgU32(&dwTimeOut, 100);
-            Log(("VBoxSVCWinMain: VBoxSvc has active connections. bActivity = %d. Loc count = %d\n",
+            Log(("VBoxSVCWinMain: WM_QUERYENDSESSION: VBoxSvc has active connections. bActivity = %d. Loc count = %d\n",
                 _Module.bActivity, _Module.GetLockCount()));
         }
-        Log(("VBoxSVCWinMain: WM_QUERYENDSESSION msg: %d rc= %d\n", msg, rc));
-    } break;
+     } break;
     case WM_ENDSESSION:
     {
@@ -211 +210 @@
             Log(("VBoxSVCWinMain: user canceled system shutdown.\n"));
         }
-        Log(("VBoxSVCWinMain: WM_ENDSESSION msg: %d. wParam: %d. lParam: %d\n", msg, wParam, lParam));
     } break;
     case WM_DESTROY:
     {
-        Log(("VBoxSVCWinMain: WM_DESTROY \n"));
         ShutdownBlockReasonDestroyAPI(hwnd);
         PostQuitMessage(0);
@@ -222 +219 @@
     default:
     {
-        Log(("VBoxSVCWinMain: msg %p\n", msg));
         rc = DefWindowProc(hwnd, msg, wParam, lParam);
     }