Index: /trunk/include/VBox/version.h =================================================================== --- /trunk/include/VBox/version.h (revision 55780) +++ /trunk/include/VBox/version.h (revision 55781) @@ -112,4 +112,8 @@ #endif #define VBOX_RC_FILE_OS VOS_NT_WINDOWS32 +#define VBOX_RC_TYPE_DLL VFT_DLL +#define VBOX_RC_TYPE_APP VFT_APP +#define VBOX_RC_TYPE_DRV VFT_DRV + /** @} */ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -36,26 +36,21 @@ BEGIN #ifdef RT_ARCH_AMD64 + VALUE "FileDescription", "VirtualBox Video Usermode D3D 64-bit Driver\0" + VALUE "InternalName", "VBoxDispD3D\0" + VALUE "OriginalFilename", "VBoxDispD3D.dll\0" +#else + VALUE "FileDescription", "VirtualBox Video Usermode D3D Driver\0" + VALUE "InternalName", "VBoxDispD3D\0" +# ifdef VBOX_WDDM_WOW64 + VALUE "OriginalFilename", "VBoxDispD3D-x86.dll\0" +# else + VALUE "OriginalFilename", "VBoxDispD3D.dll\0" +# endif +#endif VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Video Usermode D3D 64bit Driver\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_RC_PRODUCT_NAME_GA_STR 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_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxDispD3D\0" - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT -#ifdef VBOX_WDDM_WOW64 - VALUE "OriginalFilename", "VBoxDispD3D-x86.dll\0" -#else - VALUE "OriginalFilename", "VBoxDispD3D.dll\0" -#endif - VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR - VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR -#endif END END Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDisp.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" @@ -35,10 +35,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Display Driver\0" + VALUE "InternalName", "VBoxDisp\0" + VALUE "OriginalFilename", "VBoxDisp.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Display Driver\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_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPW8.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPW8.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPW8.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Video Driver for Windows 8\0" + VALUE "InternalName", "VBoxMPW8\0" + VALUE "OriginalFilename", "VBoxVideoW8.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Video Driver for Windows 8\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxMPW8\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxVideoW8.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Video Driver for Windows Vista and 7\0" + VALUE "InternalName", "VBoxMPWddm\0" + VALUE "OriginalFilename", "VBoxVideoWddm.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Video Driver for Windows Vista and 7\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxMPWddm\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxVideoWddm.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMP.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMP.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMP.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -35,10 +35,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Video Driver\0" + VALUE "InternalName", "VBoxMP\0" + VALUE "OriginalFilename", "VBoxVideo.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Video Driver\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxMP\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxVideo.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d8.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d8.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d8.rc (revision 55781) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2015 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -19,14 +19,14 @@ #include -LANGUAGE 0x09, 0x01 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox D3D8 switcher\0" + VALUE "InternalName", "D3D8\0" + VALUE "OriginalFilename", "D3D8.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox D3D8 switcher\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "D3D8\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "D3D8.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d9.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d9.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d9.rc (revision 55781) @@ -19,14 +19,14 @@ #include -LANGUAGE 0x09, 0x01 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox D3D9 switcher\0" + VALUE "InternalName", "D3D9\0" + VALUE "OriginalFilename", "D3D9.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox D3D9 switcher\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "D3D9\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "D3D9.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d8.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d8.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d8.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Wine D3D8\0" + VALUE "InternalName", "VBoxD3D8\0" + VALUE "OriginalFilename", "VBoxD3D8.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Wine D3D8\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxD3D8\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxD3D8.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR @@ -49,2 +49,3 @@ END END + Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9wddm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9wddm.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9wddm.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Wine D3D9 (WDDM)\0" + VALUE "InternalName", "VBoxD3D9\0" + VALUE "OriginalFilename", "VBoxD3D9.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Wine D3D9 (WDDM)\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxD3D9\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxD3D9.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9xpdm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9xpdm.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/d3d9xpdm.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Wine D3D9 (XPDM)\0" + VALUE "InternalName", "VBoxD3D9\0" + VALUE "OriginalFilename", "VBoxD3D9.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Wine D3D9 (XPDM)\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxD3D9\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxD3D9.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dwddm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dwddm.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dwddm.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Wine D3D (WDDM)\0" + VALUE "InternalName", "wined3dwddm\0" + VALUE "OriginalFilename", "wined3dwddm.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Wine D3D (WDDM)\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "wined3dwddm\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "wined3dwddm.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dxpdm.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dxpdm.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/wined3dxpdm.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Wine D3D (XPDM)\0" + VALUE "InternalName", "wined3d\0" + VALUE "OriginalFilename", "wined3d.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Wine D3D (XPDM)\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "wined3d\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "wined3d.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Guest Install Helper\0" + VALUE "InternalName", "VBoxGuestInstallHelper\0" + VALUE "OriginalFilename", "VBoxGuestInstallHelper.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Install Helper\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxGuestInstallHelper\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxGuestInstallHelper.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Installer/Loader/VBoxWindowsAdditions.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/Loader/VBoxWindowsAdditions.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Installer/Loader/VBoxWindowsAdditions.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -35,10 +35,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Guest Additions Loader\0" + VALUE "InternalName", "VBoxWindowsAdditions\0" + VALUE "OriginalFilename", "VBoxWindowsAdditions.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Additions Loader\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxWindowsAdditions\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxWindowsAdditions.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Installer/RegCleanup.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/RegCleanup.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Installer/RegCleanup.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox RegCleanup\0" + VALUE "InternalName", "VBoxRegCleanup\0" + VALUE "OriginalFilename", "VBoxRegCleanup.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox RegCleanup\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxRegCleanup\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxRegCleanup.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Driver Installer\0" + VALUE "InternalName", "VBoxDrvInst\0" + VALUE "OriginalFilename", "VBoxDrvInst.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Driver Installer\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxDrvInst\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxDrvInst.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Guest Driver Installer\0" + VALUE "InternalName", "VBoxGuestDrvInst\0" + VALUE "OriginalFilename", "VBoxGuestDrvInst.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Driver Installer\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxGuestDrvInst\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxGuestDrvInst.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Keyboard/Mouse Port Driver\0" + VALUE "InternalName", "i8042prt\0" + VALUE "OriginalFilename", "VBoxMouseNT.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Keyboard/Mouse Port Driver\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "i8042prt\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxMouseNT.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Mouse Filter\0" + VALUE "InternalName", "VBoxMouse\0" + VALUE "OriginalFilename", "VBoxMouse.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Mouse Filter\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxMouse\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxMouse.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/VBoxSF.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/VBoxSF.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/VBoxSF.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_INSTALLABLE BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Shared Folders Minirdr\0" + VALUE "InternalName", "VBoxSF\0" + VALUE "OriginalFilename", "VBoxSF.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Shared Folders Minirdr\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxSF\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxSF.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.rc (revision 55781) @@ -24,9 +24,10 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,9 +35,6 @@ BLOCK "040904b0" BEGIN - VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Shared Folders Minirdr NP\0" - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxMRXNP\0" - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT #ifdef VBOX_WOW64 VALUE "OriginalFilename", "VBoxMRXNP-x86.DLL\0" @@ -44,4 +42,7 @@ VALUE "OriginalFilename", "VBoxMRXNP.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 Index: /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Credential Provider\0" + VALUE "InternalName", "VBoxCredProv\0" + VALUE "OriginalFilename", "VBoxCredProv.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Credential Provider\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxCredProv\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxCredProv.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox GINA\0" + VALUE "InternalName", "VBoxGina\0" + VALUE "OriginalFilename", "VBoxGina.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox GINA\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxGina\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxGina.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/VBoxHook/VBoxHook.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Hook Driver\0" + VALUE "InternalName", "VBoxHook\0" + VALUE "OriginalFilename", "VBoxHook.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Hook Driver\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxHook\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxHook.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -35,10 +35,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Guest Additions Tray Application\0" + VALUE "InternalName", "VBoxTray\0" + VALUE "OriginalFilename", "VBoxTray.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Additions Tray Application\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxTray\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxTray.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/WINNT/tools/VBoxCertUtil.rc =================================================================== --- /trunk/src/VBox/Additions/WINNT/tools/VBoxCertUtil.rc (revision 55780) +++ /trunk/src/VBox/Additions/WINNT/tools/VBoxCertUtil.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -35,10 +35,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Certificate Utility\0" + VALUE "InternalName", "VBoxCertUtil\0" + VALUE "OriginalFilename", "VBoxCertUtil.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Certificate Utility\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxCertUtil\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxCertUtil.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.rc =================================================================== --- /trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.rc (revision 55780) +++ /trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Guest Additions Utility\0" + VALUE "InternalName", "VBoxControl\0" + VALUE "OriginalFilename", "VBoxControl.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Additions Utility\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxControl\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxControl.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc (revision 55780) +++ /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -34,10 +34,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Guest Driver\0" + VALUE "InternalName", "VBoxGuest\0" + VALUE "OriginalFilename", "VBoxGuest.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Driver\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxGuest\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxGuest.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.rc =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.rc (revision 55780) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -35,10 +35,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Guest Additions Service\0" + VALUE "InternalName", "VBoxService\0" + VALUE "OriginalFilename", "VBoxService.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Additions Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxService\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxService.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc (revision 55780) +++ /trunk/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc (revision 55781) @@ -24,9 +24,10 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" @@ -34,9 +35,6 @@ BLOCK "040904b0" BEGIN - VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxCROGL\0" - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT #ifdef VBOX_WDDM_WOW64 VALUE "OriginalFilename", "VBoxCROGL-x86.dll\0" @@ -44,4 +42,7 @@ VALUE "OriginalFilename", "VBoxCROGL.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 Index: /trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc (revision 55780) +++ /trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc (revision 55781) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2015 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" Index: /trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc (revision 55780) +++ /trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc (revision 55781) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2015 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" @@ -34,9 +34,6 @@ BLOCK "040904b0" BEGIN - VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLfeedbackpu\0" - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT #ifdef VBOX_WDDM_WOW64 VALUE "OriginalFilename", "VBoxOGLfeedbackpu-x86.dll\0" @@ -44,4 +41,7 @@ VALUE "OriginalFilename", "VBoxOGLfeedbackpu.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 Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.rc (revision 55780) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" @@ -34,9 +34,6 @@ BLOCK "040904b0" BEGIN - VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLpackspu\0" - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT #ifdef VBOX_WDDM_WOW64 VALUE "OriginalFilename", "VBoxOGLpackspu-x86.dll\0" @@ -44,4 +41,7 @@ VALUE "OriginalFilename", "VBoxOGLpackspu.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 Index: /trunk/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc (revision 55780) +++ /trunk/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" @@ -34,9 +34,6 @@ BLOCK "040904b0" BEGIN - VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLpassthroughspu\0" - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT #ifdef VBOX_WDDM_WOW64 VALUE "OriginalFilename", "VBoxOGLpassthroughspu-x86.dll\0" @@ -44,4 +41,7 @@ VALUE "OriginalFilename", "VBoxOGLpassthroughspu.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 Index: /trunk/src/VBox/Debugger/DBGCPlugInDiggers.rc =================================================================== --- /trunk/src/VBox/Debugger/DBGCPlugInDiggers.rc (revision 55780) +++ /trunk/src/VBox/Debugger/DBGCPlugInDiggers.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Debugger Plug-in\0" + VALUE "InternalName", "DBGCPlugInDiggers\0" + VALUE "OriginalFilename", "DBGCPlugInDiggers.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Debugger Plug-in\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "DBGCPlugInDiggers\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "DBGCPlugInDiggers.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Debugger/VBoxDbg.rc =================================================================== --- /trunk/src/VBox/Debugger/VBoxDbg.rc (revision 55780) +++ /trunk/src/VBox/Debugger/VBoxDbg.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Debugger\0" + VALUE "InternalName", "VBoxDbg\0" + VALUE "OriginalFilename", "VBoxDbg.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Debugger\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxDbg\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxDbg.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Devices/Graphics/VBoxSVGA3D.rc =================================================================== --- /trunk/src/VBox/Devices/Graphics/VBoxSVGA3D.rc (revision 55780) +++ /trunk/src/VBox/Devices/Graphics/VBoxSVGA3D.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox VMSVGA 3D\0" + VALUE "InternalName", "VBoxSVGA3D\0" + VALUE "OriginalFilename", "VBoxSVGA3D.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox VMSVGA 3D\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxSVGA3D\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxSVGA3D.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Devices/build/VBoxDD.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDD.rc (revision 55780) +++ /trunk/src/VBox/Devices/build/VBoxDD.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox VMM Devices and Drivers\0" + VALUE "InternalName", "VBoxDD\0" + VALUE "OriginalFilename", "VBoxDD.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox VMM Devices and Drivers\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxDD\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxDD.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Devices/build/VBoxDD2.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDD2.rc (revision 55780) +++ /trunk/src/VBox/Devices/build/VBoxDD2.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox VMM Devices and Drivers 2\0" + VALUE "InternalName", "VBoxDD2\0" + VALUE "OriginalFilename", "VBoxDD2.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox VMM Devices and Drivers 2\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxDD2\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxDD2.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Devices/build/VBoxDDU.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDDU.rc (revision 55780) +++ /trunk/src/VBox/Devices/build/VBoxDDU.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox VMM Devices and Drivers Utilities\0" + VALUE "InternalName", "VBoxDDU\0" + VALUE "OriginalFilename", "VBoxDDU.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox VMM Devices and Drivers Utilities\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxDDU\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxDDU.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.rc (revision 55780) +++ /trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_APP + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_APP FILESUBTYPE VFT2_UNKNOWN BEGIN @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Balloon Control Tool\0" + VALUE "InternalName", "VBoxBalloonCtrl\0" + VALUE "OriginalFilename", "VBoxBalloonCtrl.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Balloon Control Tool\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxBalloonCtrl\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxBalloonCtrl.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.rc (revision 55780) +++ /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.rc (revision 55781) @@ -23,16 +23,12 @@ 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,7 +36,5 @@ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual BEGIN - VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Headless Frontend\0" - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR #ifdef VBOXR3_HARDENED_DLL VALUE "InternalName", "VBoxHeadless\0" @@ -48,5 +42,4 @@ VALUE "InternalName", "VBoxHeadless\0" #endif - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT #ifdef VBOXR3_HARDENED_DLL VALUE "OriginalFilename", "VBoxHeadless.dll\0" @@ -54,4 +47,7 @@ VALUE "OriginalFilename", "VBoxHeadless.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 Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.rc (revision 55780) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_APP + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_APP FILESUBTYPE VFT2_UNKNOWN BEGIN @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Command Line Tool\0" + VALUE "InternalName", "VBoxManage\0" + VALUE "OriginalFilename", "VBoxManage.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Command Line Tool\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxManage\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxManage.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.rc (revision 55780) +++ /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.rc (revision 55781) @@ -23,16 +23,12 @@ 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,13 +36,6 @@ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual BEGIN - VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox Pure SDL Frontend\0" - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR -#ifdef VBOXR3_HARDENED_DLL VALUE "InternalName", "VBoxSDL\0" -#else - VALUE "InternalName", "VBoxSDL\0" -#endif - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT #ifdef VBOXR3_HARDENED_DLL VALUE "OriginalFilename", "VBoxSDL.dll\0" @@ -54,4 +43,7 @@ VALUE "OriginalFilename", "VBoxSDL.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 Index: /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc (revision 55780) +++ /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc (revision 55781) @@ -23,16 +23,12 @@ 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,13 +36,6 @@ 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,4 +43,7 @@ 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 Index: /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc (revision 55780) +++ /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc (revision 55781) @@ -24,12 +24,8 @@ 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,11 +33,11 @@ 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 Index: /trunk/src/VBox/GuestHost/OpenGL/error/VBoxOGLerrorspu.rc =================================================================== --- /trunk/src/VBox/GuestHost/OpenGL/error/VBoxOGLerrorspu.rc (revision 55780) +++ /trunk/src/VBox/GuestHost/OpenGL/error/VBoxOGLerrorspu.rc (revision 55781) @@ -19,18 +19,4 @@ #include -#ifdef IN_GUEST - #define DESCRIPTION_STR "VirtualBox crOpenGL ICD\0" - #ifdef VBOX_WDDM_WOW64 - #define FILENAME_STR "VBoxOGLerrorspu-x86" - #else - #define FILENAME_STR "VBoxOGLerrorspu" - #endif - #define PRODUCT_STR VBOX_RC_PRODUCT_NAME_GA_STR -#else - #define DESCRIPTION_STR "VirtualBox crOpenGL ICD\0" - #define FILENAME_STR "VBoxOGLerrorspu" - #define PRODUCT_STR VBOX_RC_PRODUCT_NAME_STR -#endif - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -39,7 +25,7 @@ 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,11 +34,24 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN +#ifdef IN_GUEST + VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" +# ifdef VBOX_WDDM_WOW64 + VALUE "InternalName", "VBoxOGLerrorspu-x86\0" + VALUE "OriginalFilename", "VBoxOGLerrorspu-x86.dll\0" +# else + VALUE "InternalName", "VBoxOGLerrorspu\0" + VALUE "OriginalFilename", "VBoxOGLerrorspu.dll\0" +# endif + VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR +#else + VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" + VALUE "InternalName", "VBoxOGLhosterrorspu\0" + VALUE "InternalFilename", "VBoxOGLhosterrorspu.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 Index: /trunk/src/VBox/GuestHost/OpenGL/error/errorspu.rc =================================================================== --- /trunk/src/VBox/GuestHost/OpenGL/error/errorspu.rc (revision 55780) +++ /trunk/src/VBox/GuestHost/OpenGL/error/errorspu.rc (revision 55781) @@ -24,9 +24,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x3L - FILESUBTYPE 0x4L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_DISPLAY BEGIN BLOCK "StringFileInfo" @@ -34,9 +34,6 @@ BLOCK "040904b0" BEGIN - VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" - VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "InternalName", "VBoxOGLerrorspu\0" - VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT #ifdef VBOX_WDDM_WOW64 VALUE "OriginalFilename", "VBoxOGLerrorspu-x86.dll\0" @@ -44,6 +41,9 @@ VALUE "OriginalFilename", "VBoxOGLerrorspu.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 + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR END END Index: /trunk/src/VBox/GuestHost/OpenGL/util/VBoxOGLcrutil.rc =================================================================== --- /trunk/src/VBox/GuestHost/OpenGL/util/VBoxOGLcrutil.rc (revision 55780) +++ /trunk/src/VBox/GuestHost/OpenGL/util/VBoxOGLcrutil.rc (revision 55781) @@ -19,17 +19,4 @@ #include -#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,7 +26,7 @@ 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,12 +35,23 @@ 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 Index: /trunk/src/VBox/GuestHost/OpenGL/util/util.rc =================================================================== --- /trunk/src/VBox/GuestHost/OpenGL/util/util.rc (revision 55780) +++ /trunk/src/VBox/GuestHost/OpenGL/util/util.rc (revision 55781) @@ -24,8 +24,8 @@ 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,9 +34,6 @@ 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,4 +41,7 @@ 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 Index: /trunk/src/VBox/HostDrivers/Support/win/VBoxDrv.rc =================================================================== --- /trunk/src/VBox/HostDrivers/Support/win/VBoxDrv.rc (revision 55780) +++ /trunk/src/VBox/HostDrivers/Support/win/VBoxDrv.rc (revision 55781) @@ -34,7 +34,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DRV + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV FILESUBTYPE VFT2_DRV_SYSTEM BEGIN @@ -43,10 +43,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Support Driver\0" + VALUE "InternalName", "VBoxDrv\0" + VALUE "OriginalFilename", "VBoxDrv.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Support Driver\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxDrv\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxDrv.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostDrivers/Support/win/VBoxSupLib.rc =================================================================== --- /trunk/src/VBox/HostDrivers/Support/win/VBoxSupLib.rc (revision 55780) +++ /trunk/src/VBox/HostDrivers/Support/win/VBoxSupLib.rc (revision 55781) @@ -34,7 +34,7 @@ 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 @@ -43,10 +43,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Kernel Support\0" + VALUE "InternalName", "VBoxSupLib\0" + VALUE "OriginalFilename", "VBoxSupLib.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Kernel Support\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxSupLib\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxSupLib.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc (revision 55780) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc (revision 55781) @@ -18,7 +18,4 @@ #include -#define DESCRIPTION_STR "VirtualBox NDIS 6.0 Lightweight Filter Driver\0" -#define FILENAME_STR "VBoxNetLwf" - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -26,9 +23,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DRV - FILESUBTYPE VFT2_DRV_NETWORK + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_NETWORK BEGIN BLOCK "StringFileInfo" @@ -36,10 +33,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox NDIS 6.0 Lightweight Filter Driver\0" + VALUE "InternalName", "VBoxNetLwf\0" + VALUE "OriginalFilename", "VBoxNetLwf.sys\0" 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 ".sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc (revision 55780) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc (revision 55781) @@ -32,7 +32,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DRV + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV FILESUBTYPE VFT2_DRV_NETWORK BEGIN Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc (revision 55780) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc (revision 55781) @@ -26,9 +26,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DRV - FILESUBTYPE VFT2_DRV_NETWORK + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV + FILESUBTYPE VFT2_DRV_NETWORK BEGIN BLOCK "StringFileInfo" @@ -36,10 +36,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", DESCRIPTION_STR + VALUE "InternalName", FILENAME_STR "\0" + VALUE "OriginalFilename", FILENAME_STR ".sys\0" 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 ".sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc (revision 55780) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc (revision 55781) @@ -24,11 +24,7 @@ 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 + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL FILESUBTYPE VFT2_UNKNOWN BEGIN @@ -37,10 +33,10 @@ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual BEGIN + VALUE "FileDescription", "VirtualBox Bridged Networking Driver Notify Object v1.1\0" + VALUE "InternalName", "VBoxNetFltNobj\0" + VALUE "OriginalFilename", "VBoxNetFltNobj.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Bridged Networking Driver Notify Object v1.1\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxNetFltNobj\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxNetFltNobj.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc (revision 55780) +++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DRV + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV FILESUBTYPE VFT2_DRV_SYSTEM BEGIN @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox USB Driver\0" + VALUE "InternalName", "VBoxUSB\0" + VALUE "OriginalFilename", "VBoxUSB.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox USB Driver\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxUSB\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxUSB.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc (revision 55780) +++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DRV + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DRV FILESUBTYPE VFT2_DRV_SYSTEM BEGIN @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox USB Monitor Driver\0" + VALUE "InternalName", "VBoxUSBMon\0" + VALUE "OriginalFilename", "VBoxUSBMon.sys\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox USB Monitor Driver\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxUSBMon\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxUSBMon.sys\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.rc =================================================================== --- /trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.rc (revision 55780) +++ /trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Drag and Drop Host Service\0" + VALUE "InternalName", "VBoxDragAndDropSvc\0" + VALUE "OriginalFilename", "VBoxDragAndDropSvc.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Drag and Drop Host Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxDragAndDropSvc\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxDragAndDropSvc.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.rc =================================================================== --- /trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.rc (revision 55780) +++ /trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Guest Control Host Service\0" + VALUE "InternalName", "VBoxGuestControl\0" + VALUE "OriginalFilename", "VBoxGuestControl.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Control Host Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxGuestControl\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxGuestControl.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.rc =================================================================== --- /trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.rc (revision 55780) +++ /trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Guest Properties Service\0" + VALUE "InternalName", "VBoxGuestPropSvc\0" + VALUE "OriginalFilename", "VBoxGuestPropSvc.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Guest Properties Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxGuestPropSvc\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxGuestPropSvc.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/HostChannel/VBoxHostChannel.rc =================================================================== --- /trunk/src/VBox/HostServices/HostChannel/VBoxHostChannel.rc (revision 55780) +++ /trunk/src/VBox/HostServices/HostChannel/VBoxHostChannel.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Host Channel Service\0" + VALUE "InternalName", "VBoxHostChannel\0" + VALUE "OriginalFilename", "VBoxHostChannel.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Host Channel Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxHostChannel\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxHostChannel.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboard.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboard.rc (revision 55780) +++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboard.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Shared Clipboard Host Service\0" + VALUE "InternalName", "VBoxSharedClipboard\0" + VALUE "OriginalFilename", "VBoxSharedClipboard.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Shared Clipboard Host Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxSharedClipboard\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxSharedClipboard.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFolders.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFolders.rc (revision 55780) +++ /trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFolders.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Shared Folders Host Service\0" + VALUE "InternalName", "VBoxSharedFolders\0" + VALUE "OriginalFilename", "VBoxSharedFolders.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Shared Folders Host Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxSharedFolders\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxSharedFolders.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/VBoxTestOGL.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/VBoxTestOGL.rc (revision 55780) +++ /trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/VBoxTestOGL.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_APP + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_APP FILESUBTYPE VFT2_UNKNOWN BEGIN @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox OpenGL Test Tool\0" + VALUE "InternalName", "VBoxTestOGL\0" + VALUE "OriginalFilename", "VBoxTestOGL.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox OpenGL Test Tool\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxTestOGL\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxTestOGL.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/SharedOpenGL/crserver/VBoxSharedCrOpenGL.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedOpenGL/crserver/VBoxSharedCrOpenGL.rc (revision 55780) +++ /trunk/src/VBox/HostServices/SharedOpenGL/crserver/VBoxSharedCrOpenGL.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox crOpenGL Host Service\0" + VALUE "InternalName", "VBoxSharedCrOpenGL\0" + VALUE "OriginalFilename", "VBoxSharedCrOpenGL.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox crOpenGL Host Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxSharedCrOpenGL\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxSharedCrOpenGL.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/SharedOpenGL/render/VBoxOGLrenderspu.rc =================================================================== --- /trunk/src/VBox/HostServices/SharedOpenGL/render/VBoxOGLrenderspu.rc (revision 55780) +++ /trunk/src/VBox/HostServices/SharedOpenGL/render/VBoxOGLrenderspu.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" + VALUE "InternalName", "VBoxOGLrenderspu\0" + VALUE "OriginalFilename", "VBoxOGLrenderspu.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox crOpenGL ICD\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxOGLrenderspu\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxOGLrenderspu.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.rc =================================================================== --- /trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.rc (revision 55780) +++ /trunk/src/VBox/HostServices/auth/simple/VBoxAuthSimple.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Simple Authentication Host Service\0" + VALUE "InternalName", "VBoxAuthSimple\0" + VALUE "OriginalFilename", "VBoxAuthSimple.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Simple Authentication Host Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxAuthSimple\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxAuthSimple.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/HostServices/auth/winlogon/VBoxAuth.rc =================================================================== --- /trunk/src/VBox/HostServices/auth/winlogon/VBoxAuth.rc (revision 55780) +++ /trunk/src/VBox/HostServices/auth/winlogon/VBoxAuth.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Authentication Host Service\0" + VALUE "InternalName", "VBoxAuth\0" + VALUE "OriginalFilename", "VBoxAuth.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Authentication Host Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxAuth\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxAuth.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.rc =================================================================== --- /trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.rc (revision 55780) +++ /trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Installation Helper\0" + VALUE "InternalName", "VBoxInstallHelper\0" + VALUE "OriginalFilename", "VBoxInstallHelper.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Installation Helper\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxInstallHelper\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxInstallHelper.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Installer/win/Resources/VBoxRes.rc =================================================================== --- /trunk/src/VBox/Installer/win/Resources/VBoxRes.rc (revision 55780) +++ /trunk/src/VBox/Installer/win/Resources/VBoxRes.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -35,10 +35,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox Resources\0" + VALUE "InternalName", "VBoxRes\0" + VALUE "OriginalFilename", "VBoxRes.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Resources\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxRes\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxRes.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Installer/win/Stub/VBoxStub.rc =================================================================== --- /trunk/src/VBox/Installer/win/Stub/VBoxStub.rc (revision 55780) +++ /trunk/src/VBox/Installer/win/Stub/VBoxStub.rc (revision 55781) @@ -25,9 +25,9 @@ FILEVERSION VBOX_RC_FILE_VERSION PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" @@ -35,10 +35,10 @@ BLOCK "040904b0" BEGIN + VALUE "FileDescription", "VirtualBox\0" + VALUE "InternalName", "VirtualBox\0" + VALUE "OriginalFilename", "VirtualBox.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox\0" 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 "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Main/cbinding/VBoxCAPI.rc =================================================================== --- /trunk/src/VBox/Main/cbinding/VBoxCAPI.rc (revision 55780) +++ /trunk/src/VBox/Main/cbinding/VBoxCAPI.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox C Bindings\0" + VALUE "InternalName", "VBoxCAPI\0" + VALUE "OriginalFilename", "VBoxCAPI.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox C Bindings\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxCAPI\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxCAPI.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Main/src-client/win/VBoxC.rc =================================================================== --- /trunk/src/VBox/Main/src-client/win/VBoxC.rc (revision 55780) +++ /trunk/src/VBox/Main/src-client/win/VBoxC.rc (revision 55781) @@ -25,12 +25,8 @@ 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,10 +34,10 @@ 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 Index: /trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc =================================================================== --- /trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc (revision 55780) +++ /trunk/src/VBox/Main/src-client/win/VBoxClient-x86.rc (revision 55781) @@ -25,12 +25,8 @@ 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,10 +34,10 @@ 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 Index: /trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.rc =================================================================== --- /trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.rc (revision 55780) +++ /trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_APP + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_APP FILESUBTYPE VFT2_UNKNOWN BEGIN @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox ExtPack Helper\0" + VALUE "InternalName", "VBoxExtPackHelperApp\0" + VALUE "OriginalFilename", "VBoxExtPackHelperApp.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox ExtPack Helper\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxExtPackHelperApp\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxExtPackHelperApp.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Main/src-server/win/VBoxSVC.rc =================================================================== --- /trunk/src/VBox/Main/src-server/win/VBoxSVC.rc (revision 55780) +++ /trunk/src/VBox/Main/src-server/win/VBoxSVC.rc (revision 55781) @@ -25,12 +25,8 @@ 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_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" @@ -38,10 +34,10 @@ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual BEGIN + VALUE "FileDescription", "VirtualBox Interface\0" + VALUE "InternalName", "VBoxSVC\0" + VALUE "OriginalFilename", "VBoxSVC.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Interface\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxSVC\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxSVC.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Main/webservice/VBoxWebSrv.rc =================================================================== --- /trunk/src/VBox/Main/webservice/VBoxWebSrv.rc (revision 55780) +++ /trunk/src/VBox/Main/webservice/VBoxWebSrv.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_APP + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_APP FILESUBTYPE VFT2_UNKNOWN BEGIN @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Web Service\0" + VALUE "InternalName", "VBoxWebSrv\0" + VALUE "OriginalFilename", "VBoxWebSrv.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Web Service\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxWebSrv\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxWebSrv.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.rc =================================================================== --- /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.rc (revision 55780) +++ /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.rc (revision 55781) @@ -25,7 +25,7 @@ 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 Index: /trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.rc =================================================================== --- /trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.rc (revision 55780) +++ /trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox NAT Engine\0" + VALUE "InternalName", "VBoxNetNAT\0" + VALUE "OriginalFilename", "VBoxNetNAT.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox NAT Engine\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxNetNAT\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxNetNAT.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Runtime/r3/win/VBoxRT.rc =================================================================== --- /trunk/src/VBox/Runtime/r3/win/VBoxRT.rc (revision 55780) +++ /trunk/src/VBox/Runtime/r3/win/VBoxRT.rc (revision 55781) @@ -34,7 +34,7 @@ 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 @@ -43,10 +43,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Runtime\0" + VALUE "InternalName", "VBoxRT\0" + VALUE "OriginalFilename", "VBoxRT.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Runtime\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxRT\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxRT.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/Storage/testcase/vbox-img.rc =================================================================== --- /trunk/src/VBox/Storage/testcase/vbox-img.rc (revision 55780) +++ /trunk/src/VBox/Storage/testcase/vbox-img.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_FILE_VERSION FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0x0L - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_APP + FILEFLAGS VBOX_RC_FILE_FLAGS + FILEOS VBOX_RC_FILE_OS + FILETYPE VBOX_RC_TYPE_APP FILESUBTYPE VFT2_UNKNOWN BEGIN @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox Virtual Disk Utility\0" + VALUE "InternalName", "vbox-img\0" + VALUE "OriginalFilename", "vbox-img.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox Virtual Disk Utility\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "vbox-img\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "vbox-img.exe\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/VBox/VMM/VMMR3/VMMR3.rc =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VMMR3.rc (revision 55780) +++ /trunk/src/VBox/VMM/VMMR3/VMMR3.rc (revision 55781) @@ -25,7 +25,7 @@ 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 @@ -34,10 +34,10 @@ BLOCK "040904b0" // Lang=US English, CharSet=Unicode BEGIN + VALUE "FileDescription", "VirtualBox VMM\0" + VALUE "InternalName", "VBoxVMM\0" + VALUE "OriginalFilename", "VBoxVMM.dll\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME - VALUE "FileDescription", "VirtualBox VMM\0" VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR - VALUE "InternalName", "VBoxVMM\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "VBoxVMM.dll\0" VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR Index: /trunk/src/recompiler/VBoxREM.rc =================================================================== --- /trunk/src/recompiler/VBoxREM.rc (revision 55780) +++ /trunk/src/recompiler/VBoxREM.rc (revision 55781) @@ -25,7 +25,7 @@ PRODUCTVERSION VBOX_RC_PRODUCT_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