Changeset 55781 in vbox for trunk/src/VBox/Main/src-client/win

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/Main/src-client/win

Files:

• VBoxC.rc (modified) (2 diffs)
• VBoxClient-x86.rc (modified) (2 diffs)

trunk/src/VBox/Main/src-client/win/VBoxC.rc

@@ -25 +25 @@
   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           VOS_NT_WINDOWS32
-  FILETYPE         VFT_DLL
-  FILESUBTYPE      0   // not used
+  FILEFLAGS        VBOX_RC_FILE_FLAGS
+  FILEOS           VBOX_RC_FILE_OS
+  FILETYPE         VBOX_RC_TYPE_DLL
+  FILESUBTYPE      VFT2_UNKNOWN
 BEGIN
   BLOCK "StringFileInfo"
@@ -38 +34 @@
     BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
     BEGIN
+      VALUE "FileDescription",  "VirtualBox Interface\0"
+      VALUE "InternalName",     "VBoxC\0"
+      VALUE "OriginalFilename", "VBoxC.dll\0"
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
-      VALUE "FileDescription",  "VirtualBox Interface\0"
       VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
-      VALUE "InternalName",     "VBoxC\0"
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-      VALUE "OriginalFilename", "VBoxC.dll\0"
       VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
       VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR

trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc

@@ -25 +25 @@
   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           VOS_NT_WINDOWS32
-  FILETYPE         VFT_DLL
-  FILESUBTYPE      0   // not used
+  FILEFLAGS        VBOX_RC_FILE_FLAGS
+  FILEOS           VBOX_RC_FILE_OS
+  FILETYPE         VBOX_RC_TYPE_DLL
+  FILESUBTYPE      VFT2_UNKNOWN
 BEGIN
   BLOCK "StringFileInfo"
@@ -38 +34 @@
     BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
     BEGIN
+      VALUE "FileDescription",  "VirtualBox Interface (32-bit)\0"
+      VALUE "InternalName",     "VBoxClient-x86\0"
+      VALUE "OriginalFilename", "VBoxClient-x86.dll\0"
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
-      VALUE "FileDescription",  "VirtualBox Interface (32-bit)\0"
       VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
-      VALUE "InternalName",     "VBoxClient-x86\0"
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-      VALUE "OriginalFilename", "VBoxClient-x86.dll\0"
       VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
       VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR