Changeset 64160 in vbox for trunk/src/VBox/Main/src-server/win

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

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (7 diffs)

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);
     }