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

Timestamp:

Aug 27, 2008 10:21:47 PM (16 years ago)

Author:

vboxsync

Message:

#3076: Merged in the branch with the alternate driver authentication method. (34468:HEAD)

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (5 diffs)
• src/hardenedmain.cpp (added)
• src/main.cpp (modified) (2 diffs)

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

@@ -34 +34 @@
 # The targets.
 #
-PROGRAMS = VirtualBox
+ifdef VBOX_WITH_HARDENING
+ PROGRAMS += VirtualBox3Hardened
+ DLLS += VirtualBox
+else
+ PROGRAMS += VirtualBox
+endif
 ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
- DLLS = VBoxKeyboard3
- OTHERS = $(PATH_BIN)/vboxkeyboard3.tar.gz
+ DLLS += VBoxKeyboard3
+ OTHERS += $(PATH_BIN)/vboxkeyboard3.tar.gz
 endif
 DLLS.os2 += VBoxHlp
 ifndef USE_KBUILD_QT3_UNIT
- INSTALLS = VirtualBox.nls
+ INSTALLS += VirtualBox.nls
 endif
 
@@ -104 +109 @@
         $(call MSG_TOOL,tar/gzip,,$@)
         $(QUIET)cd $(PATH_TARGET) && tar -chf - $(addprefix $(SOURCE_DIRECTORY)/,$(subst $(DIRECTORY_PREFIX),,$(VBoxKeyboard3_TARSOURCES))) | gzip - > $@
+
+
+#
+# Hardened VirtualBox4.
+#
+VirtualBox3Hardened_TEMPLATE = VBOXR3HARDENEDEXE
+VirtualBox3Hardened_SOURCES = src/hardenedmain.cpp
+VirtualBox3Hardened_NAME = VirtualBox3
+ifeq ($(KBUILD_TARGET),darwin) ## @todo use .darwin when ticket 36 has been fixed.
+ #VirtualBox3Hardened_INST.darwin = $(INST_BIN)VirtualBox3 $(INST_BIN)VirtualBoxVM3
+ VirtualBox3Hardened_INST = $(INST_BIN)VirtualBox3 $(INST_BIN)VirtualBoxVM3
+endif
 
 
@@ -163 +180 @@
 # VirtualBox - The GUI program.
 #
-VirtualBox_TEMPLATE = VBOXQTGUIEXE
+VirtualBox_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE)
 VirtualBox_NAME     = VirtualBox3
+ifndef VBOX_WITH_HARDENING # For the launch trick we need different inode numbers.
+ ifeq ($(KBUILD_TARGET),darwin) ## @todo use .darwin when ticket 36 has been fixed.
+  #VirtualBox_INST.darwin = $(INST_BIN)VirtualBox3 $(INST_BIN)VirtualBoxVM3
+  VirtualBox_INST = $(INST_BIN)VirtualBox3 $(INST_BIN)VirtualBoxVM3
+ endif
+endif
 ifdef USE_KBUILD_QT3_UNIT
  USES += qt3
@@ -177 +200 @@
 endif
 
-ifeq ($(KBUILD_TARGET),darwin)
- # For the launch trick we need different inode numbers.
- VirtualBox_INST = $(INST_BIN)VirtualBox3 $(INST_BIN)VirtualBoxVM3
- # For testing iChat Theater stuff change the sdk path (HACK ALERT)
- ifdef VBOX_WITH_ICHAT_THEATER
-  VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk
- endif
-endif # darwin
+# For testing iChat Theater stuff change the sdk path (HACK ALERT)
+ifdef VBOX_WITH_ICHAT_THEATER
+ VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk
+endif
 
 # Import translation sources
@@ -405 +424 @@
 endif
 VirtualBox_LDFLAGS.os2    = -Zlinker /PM:PM -Zno-fork
-VirtualBox_LDFLAGS.darwin = -framework IOKit
+VirtualBox_LDFLAGS.darwin = \
+        -framework IOKit -framework Carbon -framework QuickTime \
+        $(if $(VBOX_WITH_HARDENING),-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBox3.dylib)
 ifdef VBOX_WITH_ICHAT_THEATER
  VirtualBox_LDFLAGS.darwin += -framework Foundation -framework AppKit -framework InstantMessage -framework QuartzCore

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

@@ -114 +114 @@
 }
 
-int main (int argc, char **argv)
+extern "C" DECLEXPORT(int) TrustedMain (int argc, char **argv, char **envp)
 {
-    /* Initialize VBox Runtime. Initialize the Suplib+GC as well only if we
-     * are really about to start a VM. Don't do this if we are only starting
-     * the selector window. */
-    bool fInitGC = false;
-    for (int i = 0; i < argc; i++)
-    {
-        if (!::strcmp(argv[i], "-startvm" ))
-        {
-            fInitGC = true;
-            break;
-        }
-    }
-    RTR3Init (fInitGC, ~(size_t)0);
-
     LogFlowFuncEnter();
 
@@ -281 +267 @@
     return rc;
 }
+
+
+#ifndef VBOX_WITH_HARDENING
+int main (int argc, char **argv, char **envp)
+{
+    /* Initialize VBox Runtime. Initialize the Suplib+GC as well only if we
+     * are really about to start a VM. Don't do this if we are only starting
+     * the selector window. */
+    bool fInitGC = false;
+    for (int i = 0; i < argc; i++)
+    {
+        if (!::strcmp (argv[i], "-startvm" ))
+        {
+            fInitGC = true;
+            break;
+        }
+    }
+    RTR3Init (fInitGC, ~(size_t)0);
+
+    return TrustedMain (argc, argv, envp);
+}
+#endif /* !VBOX_WITH_HARDENING */
+