Changeset 73919 in vbox for trunk

Timestamp:

Aug 27, 2018 5:10:05 PM (6 years ago)

Author:

vboxsync

Message:

Main: On Windows, fix compiling with VBOX_WITH_SDS=

Location:

trunk/src/VBox/Main

Files:

• src-all/win/RpcChannelHook.cpp (modified) (2 diffs)
• src-server/win/svcmain.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-all/win/RpcChannelHook.cpp

@@ -29 +29 @@
 #include "RpcChannelHook.h"
 
-#ifdef RT_OS_WINDOWS
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
 
 volatile bool CRpcChannelHook::s_fChannelRegistered = false;
@@ -217 +217 @@
 }
 
-#endif
+#endif // defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)

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

@@ -97 +97 @@
 volatile uint32_t dwTimeOut = dwNormalTimeout; /* time for EXE to be idle before shutting down. Can be decreased at system shutdown phase. */
 
+
+#ifdef VBOX_WITH_SDS
 
 BOOL CALLBACK CloseWindowProc(_In_ HWND   hWnd, _In_ LPARAM /* lParam */)
@@ -204 +206 @@
 }
 
-
 #if !defined _WIN32_WINNT_WIN8
 
@@ -215 +216 @@
     return IsWindowsVersionOrGreaterWrap(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0);
 }
+
+#endif // !VBOX_WITH_SDS
 
 
@@ -313 +316 @@
 
 #ifdef VBOX_WITH_SDS
+
 class VBoxSVCRegistration;
 
@@ -628 +632 @@
 }
 
-#endif /* VBOX_WITH_SDS */
+#endif // VBOX_WITH_SDS
 
 
@@ -684 +688 @@
                          g_pModule->bActivity, g_pModule->GetLockCount()));
 
+#ifdef VBOX_WITH_SDS
                     // On Windows 7 our clients doesn't receive right sequence of Session End events
                     // So we send them all WM_QUIT to forcible close them.
@@ -691 +696 @@
                     if(!IsWindows8OrGreaterWrap())
                         CloseActiveClients();
+#endif
                 }
                 rc = !fActiveConnection;