Changeset 72247 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 17, 2018 5:28:18 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt and HostDriver/Support: bugref:9049: Hardening support for split GUI functionality (at least Win host).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/hardenedmain.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -89 +89 @@
  VirtualBoxHardenedVM_SOURCES.win = src/platform/win/VirtualBoxHardened.rc
  VirtualBoxHardenedVM_NAME = VirtualBoxVM
+ VirtualBoxHardenedVM_DEFS = VBOX_GUI_WITH_SHARED_LIBRARY
  VirtualBoxHardenedVM_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
  src/platform/win/VirtualBoxHardened.rc_INCS  = $(VirtualBox_0_OUTDIR)

trunk/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp

@@ -65 +65 @@
     uint32_t fFlags = (fStartVM && !fSeparateProcess) ? 0 : SUPSECMAIN_FLAGS_DONT_OPEN_DEV;
 
-#ifdef VBOX_RUNTIME_UI
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
+# ifdef VBOX_RUNTIME_UI
     return SUPR3HardenedMain("VirtualBoxVM",
                              fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR | SUPSECMAIN_FLAGS_OSX_VM_APP,
                              argc, argv, envp);
+# else
+    return SUPR3HardenedMain("VirtualBox",
+                             fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR,
+                             argc, argv, envp);
+# endif
 #else
-    return SUPR3HardenedMain("VirtualBox", fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR, argc, argv, envp);
+    return SUPR3HardenedMain("VirtualBoxVM",
+                             fFlags | SUPSECMAIN_FLAGS_TRUSTED_ERROR,
+                             argc, argv, envp);
 #endif
 }