diff options
author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-02-14 14:03:01 +0000 |
---|---|---|
committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-02-14 14:03:01 +0000 |
commit | 68c5676314021721c9af0ed1c6d6eb7f542b9604 (patch) | |
tree | 55258b8dde67ec4d0c2b70237f5c9617a062cf9f | |
parent | d37b6d3f189b1f8a721e6af76f47820d18ecdff7 (diff) | |
download | VirtualBox-svn-68c5676314021721c9af0ed1c6d6eb7f542b9604.tar.gz |
FE/Qt: bugref:9049: Windows: Rename VirtualBoxVM process name accordingly.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@77311 cfe28804-0f27-0410-a406-dd0f0b0b656f
-rw-r--r-- | src/VBox/Frontends/VirtualBox/Makefile.kmk | 11 | ||||
-rw-r--r-- | src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardenedVM.rc (renamed from src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc) | 6 | ||||
-rw-r--r-- | src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxVM.rc | 61 |
3 files changed, 71 insertions, 7 deletions
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index 20752b04e8d..9b7879758ac 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -54,11 +54,11 @@ include $(PATH_SUB_CURRENT)/nls/ApprovedLanguages.kmk # VirtualBoxHardenedVM_TEMPLATE = VBOXR3HARDENEDEXE VirtualBoxHardenedVM_SOURCES = src/hardenedmain.cpp -VirtualBoxHardenedVM_SOURCES.win = src/platform/win/VirtualBoxHardened.rc +VirtualBoxHardenedVM_SOURCES.win = src/platform/win/VirtualBoxHardenedVM.rc VirtualBoxHardenedVM_NAME = VirtualBoxVM VirtualBoxHardenedVM_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows) -src/platform/win/VirtualBoxHardened.rc_INCS = $(VirtualBox_0_OUTDIR) -src/platform/win/VirtualBoxHardened.rc_DEPS = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc +src/platform/win/VirtualBoxHardenedVM.rc_INCS = $(VirtualBox_0_OUTDIR) +src/platform/win/VirtualBoxHardenedVM.rc_DEPS = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc # @@ -1211,7 +1211,7 @@ VirtualBoxVM_SOURCES.darwin += \ src/platform/darwin/UICocoaDockIconPreview.mm VirtualBoxVM_SOURCES.win += \ - src/platform/win/VirtualBox.rc + src/platform/win/VirtualBoxVM.rc # @@ -1642,6 +1642,9 @@ ifeq ($(KBUILD_TARGET),win) src/platform/win/VirtualBox.rc_INCS = $(VirtualBox_0_OUTDIR) src/platform/win/VirtualBox.rc_DEPS = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc src/platform/win/VirtualBox.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc +src/platform/win/VirtualBoxVM.rc_INCS = $(VirtualBox_0_OUTDIR) +src/platform/win/VirtualBoxVM.rc_DEPS = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc +src/platform/win/VirtualBoxVM.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc $$(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@) $(APPEND) -t $@ 'IDI_ICON1 ICON "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"' diff --git a/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc b/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardenedVM.rc index a0d80d1d499..84c6938a8d1 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardened.rc +++ b/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxHardenedVM.rc @@ -32,9 +32,9 @@ BEGIN BEGIN BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual BEGIN - VALUE "FileDescription", "VirtualBox Manager\0" - VALUE "InternalName", "VirtualBox\0" - VALUE "OriginalFilename","VirtualBox.exe\0" + VALUE "FileDescription", "VirtualBox Virtual Machine\0" + VALUE "InternalName", "VirtualBox Virtual Machine\0" + VALUE "OriginalFilename","VirtualBoxVM.exe\0" VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileVersion", VBOX_RC_FILE_VERSION_STR VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT diff --git a/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxVM.rc b/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxVM.rc new file mode 100644 index 00000000000..98f6cd79941 --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBoxVM.rc @@ -0,0 +1,61 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - Windows resource file for VirtualBox.exe. + */ + +/* + * Copyright (C) 2006-2019 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 <windows.h> +#include <VBox/version.h> + +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 Virtual Machine\0" + VALUE "InternalName", "VirtualBox Virtual Machine\0" +#ifdef VBOXR3_HARDENED_DLL + VALUE "OriginalFilename", "VirtualBoxVM.dll\0" +#else + VALUE "OriginalFilename", "VirtualBoxVM.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 "VirtualBox-icon.rc" + |