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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35466

Message:

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

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxSDL.cpp (modified) (2 diffs)
• VBoxSDLHardened.cpp (added)

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

@@ -28 +28 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-PROGRAMS += VBoxSDL tstSDL
+
+#
+# Targets.
+#
+ifdef VBOX_WITH_HARDENING
+ ifneq ($(KBUILD_TARGET),darwin) # No hardened VBoxSDL on darwin.
+  PROGRAMS += VBoxSDLHardened
+  DLLS += VBoxSDL
+ endif
+else
+ PROGRAMS += VBoxSDL
+endif
+PROGRAMS += tstSDL
+
+
+#
+# Hardened VBoxSDL
+#
+VBoxSDLHardened_TEMPLATE = VBOXR3HARDENEDEXE
+VBoxSDLHardened_SOURCES = VBoxSDLHardened.cpp
+VBoxSDLHardened_NAME = VBoxSDL
 
 
@@ -34 +54 @@
 # VBoxSDL
 #
-
-VBoxSDL_TEMPLATE   = VBOXMAINCLIENTEXE
+VBoxSDL_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
 VBoxSDL_SDKS       = LIBSDL
 VBoxSDL_SOURCES    = \

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -946 +946 @@
 
 /** entry point */
-int main(int argc, char *argv[])
+extern "C"
+DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
-    /*
-     * Before we do *anything*, we initialize the runtime.
-     */
-    int rcRT = RTR3Init(true, ~(size_t)0);
-    if (VBOX_FAILURE(rcRT))
-    {
-        RTPrintf("Error: RTR3Init failed rcRC=%d\n", rcRT);
-        return 1;
-    }
-
 #ifdef VBOXSDL_WITH_X11
     /*
@@ -2926 +2917 @@
     return FAILED (rc) ? 1 : 0;
 }
+
+
+#ifndef VBOX_WITH_HARDENING
+/**
+ * Main entry point
+ */
+int main(int argc, char **argv)
+{
+    /*
+     * Before we do *anything*, we initialize the runtime.
+     */
+    int rcRT = RTR3Init(true, ~(size_t)0);
+    if (VBOX_FAILURE(rcRT))
+    {
+        RTPrintf("Error: RTR3Init failed rcRC=%d\n", rcRT);
+        return 1;
+    }
+    return TrustedMain(argc, argv, NULL);
+}
+#endif /* !VBOX_WITH_HARDENING */
+
 
 /**