Index: /trunk/Config.kmk =================================================================== --- /trunk/Config.kmk (revision 55787) +++ /trunk/Config.kmk (revision 55788) @@ -2964,4 +2964,103 @@ VBOX_RESIGN_DLL_FN = + +# +# File version info and description macros (ignored on most OSes). +# + +## +# Macro for setting DLL/SO/DYLIB version information and description. +# +# The macro must be invoked using evalcall2 after the whole target has +# been declared. +# +# @param 1 The target name. +# @param 2 The description +# @param 3 Optional icon file. +# @param 4 Optional file name. Uses $1 + default suffix by default. +define VBOX_SET_VER_INFO_DLL +ifeq ($(KBUILD_TARGET),win) +$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateDll.rc +$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \ + $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"") +endif +endef + +## +# Macro for setting EXE version information and description. +# +# The macro must be invoked using evalcall2 after the whole target has +# been declared. +# +# @param 1 The target name. +# @param 2 The description +# @param 3 Optional icon file. +# @param 4 Optional file name. Uses $1 + default suffix by default. +define VBOX_SET_VER_INFO_EXE +ifeq ($(KBUILD_TARGET),win) +$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateExe.rc +$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \ + $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"") +endif +endef + +## +# Macro for setting driver version information and description. +# +# The macro must be invoked using evalcall2 after the whole target has +# been declared. +# +# @param 1 The target name. +# @param 2 The description +# @param 3 Optional icon file. +# @param 4 Optional file name. Uses $1 + default suffix by default. +# @param 5 Optional VFT2_DRV_xxx define for windows. Uses VFT2_UNKNOWN by default. +define VBOX_SET_VER_INFO_DRV +ifeq ($(KBUILD_TARGET),win) +$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateDrv.rc +$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \ + $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"") + $(if $(5), /dIN_FILE_SUBTYPE=$(5)) +endif +endef + +## +# Macro for setting the version information and description for a ring-0 module. +# +# The macro must be invoked using evalcall2 after the whole target has +# been declared. +# +# @param 1 The target name. +# @param 2 The description +# @param 3 Optional icon file. +# @param 4 Optional file name. Uses $1 + default suffix by default. +define VBOX_SET_VER_INFO_R0 +ifeq ($(KBUILD_TARGET),win) +$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateR0.rc +$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \ + $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"") +endif +endef + +## +# Macro for setting the version information and description for a raw-mode context module. +# +# The macro must be invoked using evalcall2 after the whole target has +# been declared. +# +# @param 1 The target name. +# @param 2 The description +# @param 3 Optional icon file. +# @param 4 Optional file name. Uses $1 + default suffix by default. +define VBOX_SET_VER_INFO_RC +ifeq ($(KBUILD_TARGET),win) +$(1)_SOURCES.win += $(PATH_ROOT)/src/VBox/Resources/win/TemplateR0.rc +$(1)_RCFLAGS += /nologo /dIN_FILE_BASENAME="\"$(1)\"" /dIN_FILE_DESCRIPTION="\"$(2)\"" \ + $(if $(3), /dIN_ICON_FILE="\"$(subst \\,/,$(strip $(3)))\"") $(if $(4), /dIN_FILE_NAME="\"$(4)\"") +endif +endef + + + # # Adjust kBuild defaults. @@ -3291,4 +3390,5 @@ ifeq ($(VBOX_LDR_FMT32),pe) TEMPLATE_VBoxRc_TOOL = $(VBOX_VCC_TOOL_STEM)X86 + TEMPLATE_VBoxRc_RCDEFS = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000) ifdef TODO_MORE_WARNINGS TEMPLATE_VBoxRc_CXXFLAGS = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) -W4 -wd4244 -wd4996 -wd4127 -wd4100 -wd4214 -wd4706 $(VBOX_VCC_WERR) @@ -3426,4 +3526,5 @@ ifeq ($(VBOX_LDR_FMT),pe) TEMPLATE_VBoxR0_TOOL = $(VBOX_VCC_TOOL) +TEMPLATE_VBoxR0_RCDEFS = VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000) ifdef TODO_MORE_WARNINGS TEMPLATE_VBoxR0_CXXFLAGS = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 -wd4996 $(VBOX_VCC_WERR) Index: /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk (revision 55787) +++ /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk (revision 55788) @@ -39,4 +39,5 @@ VBoxSDLHardened_SOURCES.win = $(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc VBoxSDLHardened_NAME = VBoxSDL +$(evalcall2 VBOX_SET_VER_INFO_EXE,VBoxSDLHardened,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description. @@ -105,15 +106,9 @@ $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@ -ifeq ($(KBUILD_TARGET),win) -VBoxSDL_SOURCES += VBoxSDL.rc -VBoxSDL.rc_INCS = $(VBoxSDL_0_OUTDIR) -VBoxSDL.rc_DEPS = $(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc -VBoxSDL.rc_CLEAN = $(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc -# Icon include file. -$$(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxSDL_DEFPATH)/Makefile.kmk | $$(dir $$@) - $(RM) -f $@ - $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"' +ifdef VBOX_WITH_HARDENING +$(evalcall2 VBOX_SET_VER_INFO_DLL,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description. +else +$(evalcall2 VBOX_SET_VER_INFO_EXE,VBoxSDL,VirtualBox Pure SDL Frontend,$(VBOX_WINDOWS_ICON_FILE)) # Version info / description. endif - Index: unk/src/VBox/Frontends/VBoxSDL/VBoxSDL.rc =================================================================== --- /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.rc (revision 55787) +++ (revision ) @@ -1,61 +1,0 @@ -/* $Id$ */ -/** @file - * VBox purge SDL frontent - Windows resource file. - */ - -/* - * Copyright (C) 2015 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -#include -#include - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_RC_FILE_VERSION - PRODUCTVERSION VBOX_RC_FILE_VERSION - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS VBOX_RC_FILE_FLAGS - FILEOS VBOX_RC_FILE_OS -#ifdef VBOXR3_HARDENED_DLL - FILETYPE VBOX_RC_TYPE_APP -#else - FILETYPE VBOX_RC_TYPE_DLL -#endif - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual - BEGIN - VALUE "FileDescription", "VirtualBox Pure SDL Frontend\0" - VALUE "InternalName", "VBoxSDL\0" -#ifdef VBOXR3_HARDENED_DLL - VALUE "OriginalFilename", "VBoxSDL.dll\0" -#else - 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 - VBOX_RC_MORE_STRINGS - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - -/* Creates the application icon. */ -#include "VBoxSDL-icon.rc" - Index: /trunk/src/VBox/Resources/win/TemplateDll.rc =================================================================== --- /trunk/src/VBox/Resources/win/TemplateDll.rc (revision 55788) +++ /trunk/src/VBox/Resources/win/TemplateDll.rc (revision 55788) @@ -0,0 +1,89 @@ +/* $Id$ */ +/** @file + * Resource file template for a dynamic link library (DLL). + */ + +/* + * Copyright (C) 2015 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +/******************************************************************************* +* Defined Constants And Macros * +*******************************************************************************/ +/* Validate input and deal with optional input. */ +#ifndef IN_FILE_DESCRIPTION +# error "Must define the IN_FILE_DESCRIPTION string!" +#endif +#ifndef IN_FILE_BASENAME +# error "Must define the IN_FILE_BASENAME string!" +#endif +#ifndef IN_FILE_NAME /* optional */ +# define IN_FILE_NAME IN_FILE_BASENAME ".dll" +#endif + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include +#include + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef IN_ICON_FILE +1 ICON IN_ICON_FILE +#endif + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VBOX_RC_FILE_VERSION +PRODUCTVERSION VBOX_RC_FILE_VERSION +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" + BEGIN + BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */ + BEGIN + VALUE "FileDescription", IN_FILE_DESCRIPTION + VALUE "InternalName", IN_FILE_BASENAME "\0" + VALUE "OriginalFilename", IN_FILE_NAME "\0" + VALUE "CompanyName", VBOX_RC_COMPANY_NAME + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR + VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT +#ifndef IN_GUEST + VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR +#else + VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR +#endif + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR + VBOX_RC_MORE_STRINGS + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 /* Lang=US English, CodePage=utf-16 */ + END +END + Index: /trunk/src/VBox/Resources/win/TemplateDrv.rc =================================================================== --- /trunk/src/VBox/Resources/win/TemplateDrv.rc (revision 55788) +++ /trunk/src/VBox/Resources/win/TemplateDrv.rc (revision 55788) @@ -0,0 +1,92 @@ +/* $Id$ */ +/** @file + * Resource file template for a driver. + */ + +/* + * Copyright (C) 2015 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +/******************************************************************************* +* Defined Constants And Macros * +*******************************************************************************/ +/* Validate input and deal with optional input. */ +#ifndef IN_FILE_DESCRIPTION +# error "Must define the IN_FILE_DESCRIPTION string!" +#endif +#ifndef IN_FILE_BASENAME +# error "Must define the IN_FILE_BASENAME string!" +#endif +#ifndef IN_FILE_NAME /* optional */ +# define IN_FILE_NAME IN_FILE_BASENAME ".sys" +#endif +#ifndef IN_FILE_SUBTYPE /* optional */ +# define IN_FILE_SUBTYPE VFT2_UNKNOWN +#endif + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include +#include + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef IN_ICON_FILE +1 ICON IN_ICON_FILE +#endif + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VBOX_RC_FILE_VERSION +PRODUCTVERSION VBOX_RC_FILE_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS VBOX_RC_FILE_FLAGS +FILEOS VBOX_RC_FILE_OS +FILETYPE VBOX_RC_TYPE_DRV +FILESUBTYPE IN_FILE_SUBTYPE +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */ + BEGIN + VALUE "FileDescription", IN_FILE_DESCRIPTION + VALUE "InternalName", IN_FILE_BASENAME "\0" + VALUE "OriginalFilename", IN_FILE_NAME "\0" + VALUE "CompanyName", VBOX_RC_COMPANY_NAME + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR + VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT +#ifndef IN_GUEST + VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR +#else + VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR +#endif + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR + VBOX_RC_MORE_STRINGS + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 /* Lang=US English, CodePage=utf-16 */ + END +END + Index: /trunk/src/VBox/Resources/win/TemplateExe.rc =================================================================== --- /trunk/src/VBox/Resources/win/TemplateExe.rc (revision 55788) +++ /trunk/src/VBox/Resources/win/TemplateExe.rc (revision 55788) @@ -0,0 +1,89 @@ +/* $Id$ */ +/** @file + * Resource file template for an executable. + */ + +/* + * Copyright (C) 2015 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +/******************************************************************************* +* Defined Constants And Macros * +*******************************************************************************/ +/* Validate input and deal with optional input. */ +#ifndef IN_FILE_DESCRIPTION +# error "Must define the IN_FILE_DESCRIPTION string!" +#endif +#ifndef IN_FILE_BASENAME +# error "Must define the IN_FILE_BASENAME string!" +#endif +#ifndef IN_FILE_NAME /* optional */ +# define IN_FILE_NAME IN_FILE_BASENAME ".exe" +#endif + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include +#include + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef IN_ICON_FILE +1 ICON IN_ICON_FILE +#endif + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VBOX_RC_FILE_VERSION +PRODUCTVERSION VBOX_RC_FILE_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS VBOX_RC_FILE_FLAGS +FILEOS VBOX_RC_FILE_OS +FILETYPE VBOX_RC_TYPE_APP +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */ + BEGIN + VALUE "FileDescription", IN_FILE_DESCRIPTION + VALUE "InternalName", IN_FILE_BASENAME "\0" + VALUE "OriginalFilename", IN_FILE_NAME "\0" + VALUE "CompanyName", VBOX_RC_COMPANY_NAME + VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR + VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT +#ifndef IN_GUEST + VALUE "ProductName", VBOX_RC_PRODUCT_NAME_STR +#else + VALUE "ProductName", VBOX_RC_PRODUCT_NAME_GA_STR +#endif + VALUE "ProductVersion", VBOX_RC_PRODUCT_VERSION_STR + VBOX_RC_MORE_STRINGS + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 /* Lang=US English, CodePage=utf-16 */ + END +END + Index: /trunk/src/VBox/Resources/win/TemplateR0.rc =================================================================== --- /trunk/src/VBox/Resources/win/TemplateR0.rc (revision 55788) +++ /trunk/src/VBox/Resources/win/TemplateR0.rc (revision 55788) @@ -0,0 +1,88 @@ +/* $Id$ */ +/** @file + * Resource file template for a ring-0 module. + */ + +/* + * Copyright (C) 2015 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +/******************************************************************************* +* Defined Constants And Macros * +*******************************************************************************/ +/* Validate input and deal with optional input. */ +#ifndef IN_FILE_DESCRIPTION +# error "Must define the IN_FILE_DESCRIPTION string!" +#endif +#ifndef IN_FILE_BASENAME +# error "Must define the IN_FILE_BASENAME string!" +#endif +#ifndef IN_FILE_NAME /* optional */ +# define IN_FILE_NAME IN_FILE_BASENAME ".r0" +#endif +#ifdef IN_GUEST +# error "No R0 modules with IN_GUEST defined!" +#endif + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include "TemplateRsrcDefs.h" +#include + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef IN_ICON_FILE +1 ICON IN_ICON_FILE +#endif + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VBOX_RC_FILE_VERSION +PRODUCTVERSION VBOX_RC_FILE_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS VBOX_RC_FILE_FLAGS +FILEOS VBOX_RC_FILE_OS +FILETYPE VBOX_RC_TYPE_DRV +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */ + BEGIN + VALUE "FileDescription", IN_FILE_DESCRIPTION + VALUE "InternalName", IN_FILE_BASENAME "\0" + VALUE "OriginalFilename", IN_FILE_NAME "\0" + 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 + VBOX_RC_MORE_STRINGS + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 /* Lang=US English, CodePage=utf-16 */ + END +END + Index: /trunk/src/VBox/Resources/win/TemplateRC.rc =================================================================== --- /trunk/src/VBox/Resources/win/TemplateRC.rc (revision 55788) +++ /trunk/src/VBox/Resources/win/TemplateRC.rc (revision 55788) @@ -0,0 +1,88 @@ +/* $Id$ */ +/** @file + * Resource file template for a raw-mode context module. + */ + +/* + * Copyright (C) 2015 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +/******************************************************************************* +* Defined Constants And Macros * +*******************************************************************************/ +/* Validate input and deal with optional input. */ +#ifndef IN_FILE_DESCRIPTION +# error "Must define the IN_FILE_DESCRIPTION string!" +#endif +#ifndef IN_FILE_BASENAME +# error "Must define the IN_FILE_BASENAME string!" +#endif +#ifndef IN_FILE_NAME /* optional */ +# define IN_FILE_NAME IN_FILE_BASENAME ".rc" +#endif +#ifdef IN_GUEST +# error "No RC modules with IN_GUEST defined!" +#endif + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include "TemplateRsrcDefs.h" +#include + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef IN_ICON_FILE +1 ICON IN_ICON_FILE +#endif + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VBOX_RC_FILE_VERSION +PRODUCTVERSION VBOX_RC_FILE_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS VBOX_RC_FILE_FLAGS +FILEOS VBOX_RC_FILE_OS +FILETYPE VBOX_RC_TYPE_DRV +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" /* Lang=US English, CodePage=utf-16 */ + BEGIN + VALUE "FileDescription", IN_FILE_DESCRIPTION + VALUE "InternalName", IN_FILE_BASENAME "\0" + VALUE "OriginalFilename", IN_FILE_NAME "\0" + 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 + VBOX_RC_MORE_STRINGS + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 /* Lang=US English, CodePage=utf-16 */ + END +END + Index: /trunk/src/VBox/Resources/win/TemplateRsrcDefs.h =================================================================== --- /trunk/src/VBox/Resources/win/TemplateRsrcDefs.h (revision 55788) +++ /trunk/src/VBox/Resources/win/TemplateRsrcDefs.h (revision 55788) @@ -0,0 +1,45 @@ +/* $Id$ */ +/** @file + * Defines for templates that does not have Windows.h handy. + */ + +/* + * Copyright (C) 2015 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +#ifdef IN_ICON_FILE +IDI_ICON1 ICON IN_ICON_FILE +#endif + +#define VS_VERSION_INFO 1 +#define VS_FFI_FILEFLAGSMASK 0x3f +#define VS_FF_DEBUG 0x01 +#define VS_FF_PRERELEASE 0x02 +#define VS_FF_PATCHED 0x03 +#define VS_FF_PRIVATEBUILD 0x08 +#define VS_FF_INFOINFERRED 0x10 +#define VS_FF_SPECIALBUILD 0x20 +#define VFT_DRV 3 +#define VFT2_UNKNOWN 0 +#define VOS_NT_WINDOWS32 0x40004 +#define LANG_ENGLISH 0x409 +#define SUBLANG_ENGLISH_US 1 + Index: /trunk/src/VBox/VMM/Makefile.kmk =================================================================== --- /trunk/src/VBox/VMM/Makefile.kmk (revision 55787) +++ /trunk/src/VBox/VMM/Makefile.kmk (revision 55788) @@ -281,6 +281,4 @@ VBoxVMM_SOURCES.amd64 += \ VMMSwitcher/AMD64Stub.asm -VBoxVMM_SOURCES.win += \ - VMMR3/VMMR3.rc VBoxVMM_LIBS = \ @@ -311,4 +309,6 @@ # endif #endif + +$(evalcall2 VBOX_SET_VER_INFO_DLL,VBoxVMM,VirtualBox VMM) # Version info / description. @@ -518,4 +518,6 @@ VMMRC/VMMRCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMRCDeps.cpp to .c + + $(evalcall2 VBOX_SET_VER_INFO_RC,VMMRC,VirtualBox VMM - raw-mode context parts) # Version info / description. endif # VBOX_WITH_RAW_MODE && !VBOX_ONLY_EXTPACKS @@ -641,4 +643,6 @@ $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) endif + + $(evalcall2 VBOX_SET_VER_INFO_R0,VMMR0,VirtualBox VMM - ring-0 context parts) # Version info / description. endif # !VBOX_ONLY_EXTPACKS Index: unk/src/VBox/VMM/VMMR3/VMMR3.rc =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VMMR3.rc (revision 55787) +++ (revision ) @@ -1,51 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxVMM - Resource file containing version info. - */ - -/* - * Copyright (C) 2015 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -#include -#include - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VBOX_RC_FILE_VERSION - PRODUCTVERSION VBOX_RC_FILE_VERSION - 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" - BEGIN - 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 "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 - VBOX_RC_MORE_STRINGS - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END