Changeset 51900 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 7, 2014 10:59:18 AM (11 years ago)

Author:

vboxsync

Message:

Unbreak on w8.1 (acres.dll).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/platform/win/VirtualBox.rc (modified) (3 diffs)
• src/platform/win/VirtualBoxHardened.rc (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc ) (5 diffs)

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

@@ -55 +55 @@
 VirtualBoxHardened_TEMPLATE = VBOXR3HARDENEDEXE
 VirtualBoxHardened_SOURCES = src/hardenedmain.cpp
-VirtualBoxHardened_SOURCES.win = src/platform/win/VirtualBox.rc
+VirtualBoxHardened_SOURCES.win = src/platform/win/VirtualBoxHardened.rc
 VirtualBoxHardened_NAME = VirtualBox
 VirtualBoxHardened_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
   FILEFLAGS        0 // final version
 #endif
-  FILEOS           VOS__WINDOWS32
+  FILEOS           VOS_NT_WINDOWS32
+#ifdef VBOXR3_HARDENED_DLL
   FILETYPE         VFT_APP
+#else
+  FILETYPE         VFT_DLL
+#endif
   FILESUBTYPE      0   // not used
 BEGIN
@@ -40 +44 @@
     VALUE "FileVersion",     VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
 #ifdef VBOXR3_HARDENED_DLL
+    VALUE "InternalName",    "VirtualBox\0"
+#else
     VALUE "InternalName",    "VirtualBox.exe\0"
-#else
-    VALUE "InternalName",    "VirtualBox.dll\0"
 #endif
     VALUE "LegalCopyright",  VBOX_RC_LEGAL_COPYRIGHT

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Windows resource file for VirtualBox.exe.
+ * Windows resource file for the Hardened VirtualBox.exe.
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 #include <VBox/version.h>
 
+#if 0 /* Causes more DLLs to be loaded, don't enable it! */
 VS_VERSION_INFO    VERSIONINFO
   FILEVERSION      VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
@@ -28 +29 @@
   FILEFLAGS        0 // final version
 #endif
-  FILEOS           VOS__WINDOWS32
+  FILEOS           0 //VOS_NT_WINDOWS32
   FILETYPE         VFT_APP
   FILESUBTYPE      0   // not used
@@ -39 +40 @@
     VALUE "FileDescription", VBOX_PRODUCT " Manager\0"
     VALUE "FileVersion",     VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
-#ifdef VBOXR3_HARDENED_DLL
     VALUE "InternalName",    "VirtualBox.exe\0"
-#else
-    VALUE "InternalName",    "VirtualBox.dll\0"
-#endif
     VALUE "LegalCopyright",  VBOX_RC_LEGAL_COPYRIGHT
-#ifdef VBOXR3_HARDENED_DLL
-    VALUE "OriginalFilename","VirtualBox.dll\0"
-#else
     VALUE "OriginalFilename","VirtualBox.exe\0"
-#endif
     VALUE "ProductName",     VBOX_PRODUCT "\0"
     VALUE "ProductVersion",  VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
@@ -59 +52 @@
   END
 END
+#endif
 
 /* Creates the application icon. */