Changeset 55781 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/GuestHost/OpenGL/util

Files:

• VBoxOGLcrutil.rc (modified) (3 diffs)
• util.rc (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/VBoxOGLcrutil.rc

@@ -19 +19 @@
 #include <VBox/version.h>
 
-#ifdef IN_GUEST
- #define DESCRIPTION_STR    "VirtualBox crOpenGL ICD\0"
- #ifdef VBOX_WDDM_WOW64
-  #define FILENAME_STR       "VBoxOGLcrutil-x86"
- #else
-  #define FILENAME_STR       "VBoxOGLcrutil.dll"
- #endif
- #define PRODUCT_STR        VBOX_RC_PRODUCT_NAME_GA_STR
-#else
- #define DESCRIPTION_STR    "VirtualBox crOpenGL ICD\0"
- #define FILENAME_STR       "VBoxOGLcrhostutil"
- #define PRODUCT_STR        VBOX_RC_PRODUCT_NAME_STR
-#endif
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -39 +26 @@
   PRODUCTVERSION   VBOX_RC_FILE_VERSION
   FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
-  FILEFLAGS        0x0L
-  FILEOS           VOS_NT_WINDOWS32
-  FILETYPE         VFT_DLL
+  FILEFLAGS        VBOX_RC_FILE_FLAGS
+  FILEOS           VBOX_RC_FILE_OS
+  FILETYPE         VBOX_RC_TYPE_DLL
   FILESUBTYPE      VFT2_UNKNOWN
 BEGIN
@@ -48 +35 @@
     BLOCK "040904b0" // Lang=US English, CharSet=Unicode
     BEGIN
+#ifdef IN_GUEST
+      VALUE "FileDescription",  "VirtualBox crOpenGL ICD\0"
+# ifdef VBOX_WDDM_WOW64
+      VALUE "InternalName",     "VBoxOGLcrutil-x86\0"
+      VALUE "OriginalFilename", "VBoxOGLcrutil-x86.dll\0"
+# else
+      VALUE "InternalName",     "VBoxOGLcrutil\0"
+      VALUE "OriginalFilename", "VBoxOGLcrutil.dll\0"
+# endif
+      VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_GA_STR
+#else
+      VALUE "FileDescription",  "VirtualBox crOpenGL ICD\0"
+      VALUE "InternalName",     "VBoxOGLcrhostutil\0"
+      VALUE "InternalFilename", "VBoxOGLcrhostutil.dll\0"
+      VALUE "ProductName",      VBOX_RC_PRODUCT_NAME_STR
+#endif
       VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
-      VALUE "FileDescription",  DESCRIPTION_STR
       VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
-      VALUE "InternalName",     FILENAME_STR "\0"
       VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-      VALUE "OriginalFilename", FILENAME_STR ".dll\0"
-      VALUE "ProductName",      PRODUCT_STR
-      VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR
     END
   END

trunk/src/VBox/GuestHost/OpenGL/util/util.rc

@@ -24 +24 @@
   FILEVERSION      VBOX_RC_FILE_VERSION
   PRODUCTVERSION   VBOX_RC_FILE_VERSION
-  FILEFLAGSMASK    0x3fL
-  FILEFLAGS        0x0L
-  FILEOS           VOS_NT_WINDOWS32
-  FILETYPE         VFT_DRV
+  FILEFLAGSMASK    VS_FFI_FILEFLAGSMASK
+  FILEFLAGS        VBOX_RC_FILE_FLAGS
+  FILEOS           VBOX_RC_FILE_OS
+  FILETYPE         VBOX_RC_TYPE_DRV
   FILESUBTYPE      VFT2_DRV_DISPLAY
 BEGIN
@@ -34 +34 @@
     BLOCK "040904b0"
     BEGIN
-      VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
       VALUE "FileDescription",  "VirtualBox crOpenGL crutil ICD\0"
-      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR
       VALUE "InternalName",     "VBoxOGLcrutil\0"
-      VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
 #ifdef VBOX_WDDM_WOW64
       VALUE "OriginalFilename", "VBoxOGLcrutil-x86.dll\0"
@@ -44 +41 @@
       VALUE "OriginalFilename", "VBoxOGLcrutil.dll\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_GA_STR
       VALUE "ProductVersion",   VBOX_RC_PRODUCT_VERSION_STR