Changeset 55771 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp

Timestamp:

May 8, 2015 8:17:50 PM (10 years ago)

Author:

vboxsync

Message:

Use defines in the RC files and make those defines compatible with what we use in C/C++ code.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp

Files:

• wddm/VBoxDispD3D.rc (modified) (3 diffs)
• xpdm/VBoxDisp.rc (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.rc

@@ -23 +23 @@
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION          VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
-   PRODUCTVERSION       VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
+   FILEVERSION      VBOX_RC_FILE_VERSION
+   PRODUCTVERSION   VBOX_RC_FILE_VERSION
    FILEFLAGSMASK        0x3fL
    FILEFLAGS            0x0L
@@ -38 +38 @@
          VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
          VALUE "FileDescription",  "VirtualBox Video Usermode D3D 64bit Driver\0"
-         VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
+         VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
          VALUE "InternalName",     "VBoxDispD3D\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
          VALUE "OriginalFilename", "VBoxDispD3D.dll\0"
          VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
-         VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
+         VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
 #else
          VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
          VALUE "FileDescription",  "VirtualBox Video Usermode D3D Driver\0"
-         VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
+         VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
          VALUE "InternalName",     "VBoxDispD3D\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
@@ -56 +56 @@
 #endif
          VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
-         VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
+         VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
 #endif
       END

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.rc

@@ -23 +23 @@
 
 VS_VERSION_INFO VERSIONINFO
-   FILEVERSION          VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
-   PRODUCTVERSION       VBOX_VERSION_MAJOR_NR,VBOX_VERSION_MINOR_NR,VBOX_VERSION_BUILD_NR,0
+   FILEVERSION      VBOX_RC_FILE_VERSION
+   PRODUCTVERSION   VBOX_RC_FILE_VERSION
    FILEFLAGSMASK        0x3fL
    FILEFLAGS            0x0L
@@ -37 +37 @@
          VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
          VALUE "FileDescription",  "VirtualBox Display Driver\0"
-         VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
+         VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
          VALUE "InternalName",     "VBoxDisp\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
          VALUE "OriginalFilename", "VBoxDisp.dll\0"
          VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
-         VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
+         VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
       END
    END