Changeset 85489 in vbox

Timestamp:

Jul 28, 2020 2:51:29 PM (5 years ago)

Author:

vboxsync

Message:

Main: bugref:9784: Moved the call to CoInitializeSecurity into com::Initialize from UICommon.cpp and VirtualBoxClientImpl.cpp

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/globals/UICommon.cpp (modified) (1 diff)
• Main/Makefile.kmk (modified) (1 diff)
• Main/glue/initterm.cpp (modified) (1 diff)
• Main/src-client/VirtualBoxClientImpl.cpp (modified) (1 diff)

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

@@ -4091 +4091 @@
     }
 
-#ifdef VBOX_WITH_SDS
-    // setup Client COM Security to enable impersonation required by VBOX_SDS
-    HRESULT hrGUICoInitializeSecurity = CoInitializeSecurity(NULL,
-                                                             -1,
-                                                             NULL,
-                                                             NULL,
-                                                             RPC_C_AUTHN_LEVEL_DEFAULT,
-                                                             RPC_C_IMP_LEVEL_IMPERSONATE,
-                                                             NULL,
-                                                             EOAC_NONE,
-                                                             NULL);
-    NOREF(hrGUICoInitializeSecurity);
-    Assert(RPC_E_TOO_LATE != hrGUICoInitializeSecurity);
-    Assert(hrGUICoInitializeSecurity == S_OK);
-#endif
-
     /* Make sure VirtualBoxClient instance created: */
     m_comVBoxClient.createInstance(CLSID_VirtualBoxClient);

trunk/src/VBox/Main/Makefile.kmk

@@ -1233 +1233 @@
   VBoxCOM_DEFS.win      = VBOX_WITH_AUTO_COM_REG_UPDATE
  endif
+ ifdef VBOX_WITH_SDS
+  VBoxCOM_DEFS.win     += VBOX_WITH_SDS
+ endif
  VBoxCOM_DEFS.x86       = _WIN32_WINNT=0x0500
  VBoxCOM_DEFS.amd64     = _WIN32_WINNT=0x0510

trunk/src/VBox/Main/glue/initterm.cpp

@@ -457 +457 @@
     AssertMsg(rc == S_OK || rc == S_FALSE, ("rc=%08X\n", rc));
 
+#if defined(VBOX_WITH_SDS)
+    // Setup COM Security to enable impersonation
+    HRESULT hrGUICoInitializeSecurity = CoInitializeSecurity(NULL,
+                                                             -1,
+                                                             NULL,
+                                                             NULL,
+                                                             RPC_C_AUTHN_LEVEL_DEFAULT,
+                                                             RPC_C_IMP_LEVEL_IMPERSONATE,
+                                                             NULL,
+                                                             EOAC_NONE,
+                                                             NULL);
+    NOREF(hrGUICoInitializeSecurity);
+    Assert(SUCCEEDED(hrGUICoInitializeSecurity) || hrGUICoInitializeSecurity == RPC_E_TOO_LATE);
+#endif
+
     /*
      * IRundown has unsafe two methods we need to patch to prevent remote access.

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -75 +75 @@
 HRESULT VirtualBoxClient::init()
 {
-
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
-    // setup COM Security to enable impersonation
-    // This works for console VirtualBox clients, GUI has own security settings
-    //  For GUI VirtualBox it will be second call so can return TOO_LATE error
-    HRESULT hrGUICoInitializeSecurity = CoInitializeSecurity(NULL,
-                                                             -1,
-                                                             NULL,
-                                                             NULL,
-                                                             RPC_C_AUTHN_LEVEL_DEFAULT,
-                                                             RPC_C_IMP_LEVEL_IMPERSONATE,
-                                                             NULL,
-                                                             EOAC_NONE,
-                                                             NULL);
-    NOREF(hrGUICoInitializeSecurity);
-    Assert(SUCCEEDED(hrGUICoInitializeSecurity) || hrGUICoInitializeSecurity == RPC_E_TOO_LATE);
-#endif
-
     LogFlowThisFuncEnter();