Changeset 38626 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Sep 5, 2011 9:53:39 AM (14 years ago)

Author:

vboxsync

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

73833

Message:

FE/Headless: backed out r73813, r73814, r73815, r73816, r73821 (no separate VBoxHeadless instances for console and Windows required)

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxHeadless-win.cpp (deleted)
• VBoxHeadless.cpp (modified) (2 diffs)

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

@@ -30 +30 @@
  PROGRAMS += VBoxHeadlessHardened
  DLLS += VBoxHeadless
- VBOX_WITH_HEADLESS_DLL = 1
 else
- if "$(KBUILD_TARGET)" == "win"
-  PROGRAMS += VBoxHeadlessSVC VBoxHeadlessC
-  DLLS += VBoxHeadless
-  VBOX_WITH_HEADLESS_DLL = 1
- else
-  PROGRAMS += VBoxHeadless
- endif
+ PROGRAMS += VBoxHeadless
 endif
 
@@ -49 +42 @@
 VBoxHeadlessHardened_NAME = VBoxHeadless
 
-#
-# Console subsystem VBoxHeadless.
-#
-VBoxHeadlessC_TEMPLATE = VBOXMAINCLIENTEXE
-VBoxHeadlessC_SOURCES = VBoxHeadless-win.cpp
-VBoxHeadlessC_NAME = VBoxHeadless
-VBoxHeadlessC_LDFLAGS.win = /SUBSYSTEM:console
-VBoxHeadlessC_LIBS += $(PATH_STAGE_LIB)/VBoxHeadless$(VBOX_SUFF_LIB)
-
-#
-# Windows subsystem VBoxHeadless.
-#
-VBoxHeadlessSVC_EXTENDS = VBoxHeadlessC
-VBoxHeadlessSVC_NAME = VBoxHeadlessSVC
-VBoxHeadlessSVC_LDFLAGS.win = /SUBSYSTEM:windows
-VBoxHeadlessSVC_DEFS = VBOX_HEADLESS_SVC
 
 #
 # VBoxHeadless
 #
-VBoxHeadless_TEMPLATE  := $(if $(VBOX_WITH_HEADLESS_DLL),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
+VBoxHeadless_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
 VBoxHeadless_DEFS       = VBOX_FFMPEG
 VBoxHeadless_SOURCES    = VBoxHeadless.cpp

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -1346 +1346 @@
 
 #ifndef VBOX_WITH_HARDENING
-/*
- * Used by windows exe stub code
- */
-extern "C" DECLEXPORT(int) ExecTrustedMain(int argc, char **argv, char **envp)
-{
-    // initialize VBox Runtime
-    int rc = RTR3InitAndSUPLib();
-    if (RT_FAILURE(rc))
-    {
-        RTPrintf("VBoxHeadless: Runtime Error:\n"
-                 " %Rrc -- %Rrf\n", rc, rc);
-        switch (rc)
-        {
-            case VERR_VM_DRIVER_NOT_INSTALLED:
-                RTPrintf("Cannot access the kernel driver. Make sure the kernel module has been \n"
-                        "loaded successfully. Aborting ...\n");
-                break;
-            default:
-                break;
-        }
-        return 1;
-    }
-
-    return TrustedMain(argc, argv, envp);
-}
-
 /**
  * Main entry point.
@@ -1377 +1351 @@
 int main(int argc, char **argv, char **envp)
 {
-    return ExecTrustedMain(argc, argv, envp);
+    // initialize VBox Runtime
+    int rc = RTR3InitAndSUPLib();
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("VBoxHeadless: Runtime Error:\n"
+                 " %Rrc -- %Rrf\n", rc, rc);
+        switch (rc)
+        {
+            case VERR_VM_DRIVER_NOT_INSTALLED:
+                RTPrintf("Cannot access the kernel driver. Make sure the kernel module has been \n"
+                        "loaded successfully. Aborting ...\n");
+                break;
+            default:
+                break;
+        }
+        return 1;
+    }
+
+    return TrustedMain(argc, argv, envp);
 }
 #endif /* !VBOX_WITH_HARDENING */