Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp =================================================================== --- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (revision 55789) +++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (revision 55790) @@ -2332,5 +2332,5 @@ pSurface->formatGL = GL_DEPTH_COMPONENT; pSurface->typeGL = GL_UNSIGNED_SHORT; - AssertMsgFailed(("Test me - SVGA3D_Z_D16\n")); + //AssertMsgFailed(("Test me - SVGA3D_Z_D16\n")); break; case SVGA3D_Z_D24S8: /* D3DFMT_D24S8 - WINED3DFMT_D24_UNORM_S8_UINT */ Index: unk/src/VBox/Devices/Graphics/VBoxSVGA3D.rc =================================================================== --- /trunk/src/VBox/Devices/Graphics/VBoxSVGA3D.rc (revision 55789) +++ (revision ) @@ -1,51 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxSVGA3D - Resource file containing version info and icon. - */ - -/* - * 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 VMSVGA 3D\0" - VALUE "InternalName", "VBoxSVGA3D\0" - VALUE "OriginalFilename", "VBoxSVGA3D.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 Index: /trunk/src/VBox/Devices/Makefile.kmk =================================================================== --- /trunk/src/VBox/Devices/Makefile.kmk (revision 55789) +++ /trunk/src/VBox/Devices/Makefile.kmk (revision 55790) @@ -87,6 +87,4 @@ Storage/VSCSI/VSCSIVpdPagePool.cpp \ build/VBoxDDUDeps.cpp - VBoxDDU_SOURCES.win = \ - build/VBoxDDU.rc ifdef VBOX_WITH_USB VBoxDDU_INCS.os2 += \ @@ -111,4 +109,5 @@ VBoxDDU_LDFLAGS.linux = -Wl,--no-undefined + $(call VBOX_SET_VER_INFO_DLL,VBoxDDU,VirtualBox VMM Devices and Drivers Utilities) # @@ -188,6 +187,4 @@ Network/DrvNetSniffer.cpp \ Network/Pcap.cpp - VBoxDD_SOURCES.win = \ - build/VBoxDD.rc ifn1of ($(KBUILD_TARGET), os2) VBoxDD_SOURCES += Storage/DrvHostBase.cpp @@ -1029,4 +1026,7 @@ + $(call VBOX_SET_VER_INFO_DLL,VBoxDD,VirtualBox VMM Devices and Drivers) # (last!) + + # # VBoxDD2 (shared object) @@ -1042,6 +1042,4 @@ PC/DevIoApic.cpp \ PC/DevLPC.cpp - VBoxDD2_SOURCES.win = \ - build/VBoxDD2.rc VBoxDD2_LIBS = \ $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \ @@ -1061,4 +1059,5 @@ endif + $(call VBOX_SET_VER_INFO_DLL,VBoxDD2,VirtualBox VMM Devices and Drivers 2) # (last!) # @@ -1336,6 +1335,5 @@ USB/DevEHCI.cpp \ USB/DevXHCI.cpp - VBoxEhciR3_SOURCES.win = \ - build/VBoxEhciR3.rc + $(call VBOX_SET_VER_INFO_DLL,VBoxEhciR3,PUEL Extension Pack - EHCI Device) SYSMODS += VBoxEhciR0 @@ -1344,4 +1342,5 @@ USB/DevEHCI.cpp \ USB/DevXHCI.cpp + $(call VBOX_SET_VER_INFO_R0,VBoxEhciR0,PUEL Extension Pack - EHCI Device$(COMMA) ring-0) ifdef VBOX_WITH_RAW_MODE @@ -1351,4 +1350,5 @@ USB/DevEHCI.cpp \ USB/DevXHCI.cpp + $(call VBOX_SET_VER_INFO_RC,VBoxEhciRC,PUEL Extension Pack - EHCI Device$(COMMA) raw-mode) endif @@ -1366,14 +1366,15 @@ VBoxPciRawR3_TEMPLATE = VBoxR3ExtPackPuel VBoxPciRawR3_SOURCES = Bus/DevPciRaw.cpp - VBoxPciRawR3_SOURCES.win = build/VBoxPciRawR3.rc + $(call VBOX_SET_VER_INFO_DLL,VBoxPciRawR3,PUEL Extension Pack - PCI Passthrough Device) DLLS += VBoxPciRawDrv VBoxPciRawDrv_TEMPLATE = VBoxR3ExtPackPuel VBoxPciRawDrv_SOURCES = Bus/DrvPciRaw.cpp - VBoxPciRawDrv_SOURCES.win = build/VBoxPciRawDrv.rc + $(call VBOX_SET_VER_INFO_DLL,VBoxPciRawDrv,PUEL Extension Pack - PCI Passthrough Driver) SYSMODS += VBoxPciRawR0 VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel VBoxPciRawR0_SOURCES = Bus/DevPciRaw.cpp + $(call VBOX_SET_VER_INFO_R0,VBoxPciRawR0,PUEL Extension Pack - PCI Passthrough Driver$(COMMA) ring-0) Bus/DevPciRaw.cpp_INCS = Bus @@ -1466,6 +1467,4 @@ Graphics/shaderlib/directx.c \ Graphics/shaderlib/libWineStub/debug.c - VBoxSVGA3D_SOURCES.win := \ - Graphics/VBoxSVGA3D.rc VBoxSVGA3D_LIBS = $(LIB_RUNTIME) VBoxSVGA3D_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib @@ -1475,4 +1474,5 @@ VBoxSVGA3D_LDFLAGS.darwin += \ -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxSVGA3D.dylib + $(call VBOX_SET_VER_INFO_DLL,VBoxSVGA3D,VirtualBox VMSVGA 3D) # Index: unk/src/VBox/Devices/build/VBoxDD.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDD.rc (revision 55789) +++ (revision ) @@ -1,51 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxDD - 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 Devices and Drivers\0" - VALUE "InternalName", "VBoxDD\0" - VALUE "OriginalFilename", "VBoxDD.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 Index: unk/src/VBox/Devices/build/VBoxDD2.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDD2.rc (revision 55789) +++ (revision ) @@ -1,51 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxDD2 - 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 Devices and Drivers 2\0" - VALUE "InternalName", "VBoxDD2\0" - VALUE "OriginalFilename", "VBoxDD2.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 Index: unk/src/VBox/Devices/build/VBoxDDU.rc =================================================================== --- /trunk/src/VBox/Devices/build/VBoxDDU.rc (revision 55789) +++ (revision ) @@ -1,51 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxDDU - 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 Devices and Drivers Utilities\0" - VALUE "InternalName", "VBoxDDU\0" - VALUE "OriginalFilename", "VBoxDDU.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