Changeset 35753 in vbox

Timestamp:

Jan 28, 2011 10:58:06 AM (14 years ago)

Author:

vboxsync

Message:

various nits.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (1 diff)
• Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (1 diff)
• Additions/WINNT/Installer/VBoxGuestAdditionsNT4.nsh (modified) (1 diff)
• Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh (modified) (1 diff)
• Additions/WINNT/Installer/VBoxGuestAdditionsUninstallOld.nsh (modified) (1 diff)
• Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh (modified) (1 diff)
• Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)
• Devices/Bus/DevPCI.cpp (modified) (4 diffs)
• Devices/Bus/DevPciIch9.cpp (modified) (7 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• Main/src-client/VBoxDriversRegister.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -1 @@
-;*
-;* @file
-;* VBoxGuestAdditions.nsi - Main file for Windows Guest Additions installation.
-;*
-
-;*
-;* Copyright (C) 2011 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.
-;*
+; $Id$
+;; @file
+; VBoxGuestAdditions.nsi - Main file for Windows Guest Additions installation.
+;
+
+;
+; Copyright (C) 2011 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.
+;
 
 !if $%BUILD_TYPE% == "debug"

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

@@ -1 @@
-;*
-;* @file
-;* VBoxGuestAdditionsCommon.nsh - Common / shared utility functions.
-;*
-
-;*
-;* Copyright (C) 2011 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.
-;*
+; $Id: $
+;; @file
+; VBoxGuestAdditionsCommon.nsh - Common / shared utility functions.
+;
+
+;
+; Copyright (C) 2006-2011 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.
+;
 
 !ifndef UNINSTALLER_ONLY

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsNT4.nsh

@@ -1 @@
-;*
-;* @file
-;* VBoxGuestAdditionsNT4.nsh - Guest Additions installation for NT4.
-;*
-
-;*
-;* Copyright (C) 2011 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.
-;*
+; $Id: $
+;; @file
+; VBoxGuestAdditionsNT4.nsh - Guest Additions installation for NT4.
+;
+
+;
+; Copyright (C) 2006-2011 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.
+;
 
 Function NT4_SetVideoResolution

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh

@@ -1 @@
-;*
-;* @file
-;* VBoxGuestAdditionsUninstall.nsh - Guest Additions uninstallation.
-;*
+; $Id: $
+;; @file
+; VBoxGuestAdditionsUninstall.nsh - Guest Additions uninstallation.
+;
 
-;*
-;* Copyright (C) 2011 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.
-;*
+;
+; Copyright (C) 2006-2011 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.
+;
 
 !macro UninstallCommon un

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstallOld.nsh

@@ -1 @@
-;*
-;* @file
-;* VBoxGuestAdditionsUninstallOld.nsh - Guest Additions uninstallation handling
-;*                                      for legacy packages.
-;*
-
-;*
-;* Copyright (C) 2011 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.
-;*
+; $Id: $
+;; @file
+; VBoxGuestAdditionsUninstallOld.nsh - Guest Additions uninstallation handling
+;                                      for legacy packages.
+;
+
+;
+; Copyright (C) 2006-2011 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.
+;
 
 !macro Uninstall_RunExtUnInstaller un

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh

@@ -1 @@
-;*
-;* @file
-;* VBoxGuestAdditionsVista.nsh - Guest Additions installation for Windows Vista/7.
-;*
+; $Id: $
+;; @file
+; VBoxGuestAdditionsVista.nsh - Guest Additions installation for Windows Vista/7.
+;
 
-;*
-;* Copyright (C) 2011 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.
-;*
+;
+; Copyright (C) 2006-2011 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.
+;
 
 Function Vista_CopyFiles

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -1 @@
-;*
-;* @file
-;* VBoxGuestAdditionsW2KXP.nsh - Guest Additions installation for Windows 2000/XP.
-;*
-
-;*
-;* Copyright (C) 2011 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.
-;*
+; $Id: $
+;; @file
+; VBoxGuestAdditionsW2KXP.nsh - Guest Additions installation for Windows 2000/XP.
+;
+
+;
+; Copyright (C) 2006-2011 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.
+;
 
 Function W2K_SetVideoResolution

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -2024 +2024 @@
 static DECLCALLBACK(int)   pciConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    int rc;
     Assert(iInstance == 0);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -2035 +2035 @@
     /* query whether we got an IOAPIC */
     bool fUseIoApic;
-    rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
+    int rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -2417 +2417 @@
 static DECLCALLBACK(int)   pcibridgeConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    int rc;
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -2427 +2427 @@
     /* check if RC code is enabled. */
     bool fGCEnabled;
-    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
+    int rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -1202 +1202 @@
      */
     uint8_t const fBridge = fIsBridge ? 2 : 1;
-    Assert(!PCIIsPassthrough(pDev)); 
+    Assert(!PCIIsPassthrough(pDev));
     uint8_t *pbDstConfig = &pDev->config[0];
 
@@ -1398 +1398 @@
 
         /* commit the loaded device config. */
-        Assert(!PCIIsPassthrough(pDev)); 
+        Assert(!PCIIsPassthrough(pDev));
         pciR3CommonRestoreConfig(pDev, &DevTmp.config[0], false ); /** @todo fix bridge fun! */
 
@@ -1756 +1756 @@
     }
 
-    AssertMsgReturn(u32Address + len <= 256, ("Read after end of PCI config space\n"), 
-                    0); 
+    AssertMsgReturn(u32Address + len <= 256, ("Read after end of PCI config space\n"),
+                    0);
     if (   PCIIsMsiCapable(aDev)
         && (u32Address >= aDev->Int.s.u8MsiCapOffset)
@@ -2274 +2274 @@
                                           PCFGMNODE  pCfg)
 {
-    int rc;
     Assert(iInstance == 0);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -2291 +2291 @@
     /* query whether we got an IOAPIC */
     bool fUseIoApic;
-    rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
+    int rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -2588 +2588 @@
                                                   PCFGMNODE  pCfg)
 {
-    int rc;
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -2598 +2598 @@
     /* check if RC code is enabled. */
     bool fGCEnabled;
-    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
+    int rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -35 +35 @@
 #include "Global.h"
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-#include "PciRawDevImpl.h"
+# include "PciRawDevImpl.h"
 #endif
 

trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp

@@ -27 +27 @@
 #include "ConsoleImpl.h"
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-#include "PciRawDevImpl.h"
+# include "PciRawDevImpl.h"
 #endif