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

Timestamp:

May 8, 2015 10:19:56 PM (10 years ago)

Author:

vboxsync

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

100207

Message:

Clean up RC files, adding more version.h defines for common values.

Location:

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

Files:

• VirtualBox.rc (modified) (3 diffs)
• VirtualBoxHardened.rc (modified) (2 diffs)

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

@@ -23 +23 @@
   PRODUCTVERSION   VBOX_RC_FILE_VERSION
   FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-  FILEFLAGS        VS_FF_DEBUG|VS_FF_PRIVATEBUILD|VS_FF_PRERELEASE
+  FILEFLAGS        VBOX_RC_FILE_FLAGS
+  FILEOS           VBOX_RC_FILE_OS
+#ifdef VBOXR3_HARDENED_DLL
+  FILETYPE         VBOX_RC_TYPE_APP
 #else
-  FILEFLAGS        0 // final version
+  FILETYPE         VBOX_RC_TYPE_DLL
 #endif
-  FILEOS           VOS_NT_WINDOWS32
-#ifdef VBOXR3_HARDENED_DLL
-  FILETYPE         VFT_APP
-#else
-  FILETYPE         VFT_DLL
-#endif
-  FILESUBTYPE      0   // not used
+  FILESUBTYPE      VFT2_UNKNOWN
 BEGIN
   BLOCK "StringFileInfo"
@@ -40 +36 @@
     BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
     BEGIN
-      VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
       VALUE "FileDescription",  "VirtualBox Manager\0"
-      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
-#ifdef VBOXR3_HARDENED_DLL
       VALUE "InternalName",     "VirtualBox\0"
-#else
-      VALUE "InternalName",     "VirtualBox\0"
-#endif
-      VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
 #ifdef VBOXR3_HARDENED_DLL
       VALUE "OriginalFilename", "VirtualBox.dll\0"
@@ -54 +43 @@
       VALUE "OriginalFilename", "VirtualBox.exe\0"
 #endif
+      VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
+      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
+      VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
       VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
       VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR

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

@@ -24 +24 @@
   PRODUCTVERSION   VBOX_RC_FILE_VERSION
   FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-  FILEFLAGS        VS_FF_DEBUG|VS_FF_PRIVATEBUILD|VS_FF_PRERELEASE
-#else
-  FILEFLAGS        0 // final version
-#endif
-  FILEOS           0 //VOS_NT_WINDOWS32
-  FILETYPE         VFT_APP
-  FILESUBTYPE      0   // not used
+  FILEFLAGS        VBOX_RC_FILE_FLAGS
+  FILEOS           VBOX_RC_FILE_OS
+  FILETYPE         VBOX_RC_TYPE_APP
+  FILESUBTYPE      VFT2_UNKNOWN
 BEGIN
   BLOCK "StringFileInfo"
@@ -37 +33 @@
     BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
     BEGIN
-      VALUE "CompanyName",     VBOX_RC_COMPANY_NAME
       VALUE "FileDescription", "VirtualBox Manager\0"
+      VALUE "InternalName",    "VirtualBox\0"
+      VALUE "OriginalFilename","VirtualBox.exe\0"
+      VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
       VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
-      VALUE "InternalName",    "VirtualBox\0"
-      VALUE "LegalCopyright",  VBOX_RC_LEGAL_COPYRIGHT
-      VALUE "OriginalFilename","VirtualBox.exe\0"
-      VALUE "ProductName",     VBOX_RC_PRODUCT_NAME_STR
+      VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
+      VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
       VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
     END