Changeset 45356 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 5, 2013 7:01:27 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84772

Message:

tabs

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (2 diffs)
• common/VBoxService/VBoxServiceVMInfo.cpp (modified) (2 diffs)
• haiku/VBoxTray/VBoxGuestDeskbarView.h (modified) (2 diffs)
• haiku/VBoxVideo/driver/driver.cpp (modified) (2 diffs)
• linux/drm/vboxvideo.h (modified) (2 diffs)
• x11/vboxmouse/vboxmouse.c (modified) (2 diffs)
• x11/vboxvideo/vboxvideo.c (modified) (6 diffs)
• x11/vboxvideo/vboxvideo.h (modified) (1 diff)
• x11/vboxvideo/vboxvideo_dri.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -383 +383 @@
 
 #elif defined(RT_OS_HAIKU)
-        /* The ioctl hook in Haiku does take the len parameter when specified,
-         * so just use it.
-         */
+    /* The ioctl hook in Haiku does take the len parameter when specified,
+     * so just use it. */
     int rc = ioctl((int)g_File, iFunction, pvData, cbData);
     if (RT_LIKELY(rc == 0))

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -393 +393 @@
 static dbus_bool_t vboxService_dbus_message_get_args(DBusMessage *message,
                                                      DBusError   *error,
-                                                     int              first_arg_type,
+                                                     int first_arg_type,
                                                      ...)
 {

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -72 +72 @@
         virtual ~VBoxGuestDeskbarView();
 
-                static  BArchivable*   Instantiate(BMessage *data);
+        static  BArchivable*   Instantiate(BMessage *data);
         virtual status_t       Archive(BMessage *data, bool deep = true) const;
 

trunk/src/VBox/Additions/haiku/VBoxVideo/driver/driver.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012 Oracle-2013 Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -114 +114 @@
 struct DeviceInfo
 {
-    uint32          openCount;                  /* Count of how many times device has been opened */
-    uint32          flags;                                      /* Device flags */
-    area_id         sharedArea;                 /* Area shared between driver and all accelerants */
-    SharedInfo     *sharedInfo;                 /* Pointer to shared info area memory */
-    pci_info        pciInfo;                    /* Copy of pci info for this device */
+    uint32          openCount;              /* Count of how many times device has been opened */
+    uint32          flags;                  /* Device flags */
+    area_id         sharedArea;             /* Area shared between driver and all accelerants */
+    SharedInfo     *sharedInfo;             /* Pointer to shared info area memory */
+    pci_info        pciInfo;                /* Copy of pci info for this device */
     char            name[B_OS_NAME_LENGTH]; /* Name of device */
 };

trunk/src/VBox/Additions/linux/drm/vboxvideo.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -68 +68 @@
     struct vboxvideo_mode_info  mode_info;
 
-    int                             num_crtc;
+    int                 num_crtc;
 };
 
-#endif                /* __DRM_VBOXVIDEO_H__ */
+#endif /* __DRM_VBOXVIDEO_H__ */

trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse.c

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -117 +117 @@
 #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
                                  VBoxPtrCtrlProc, GetMotionHistorySize(),
-                                                                 2 /* Number of axes */
+                                 2 /* Number of axes */
 #else
 # error Unsupported version of X.Org

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -157 +157 @@
 {
     {VBOX_DEVICEID, "vbox"},
-    {-1,         NULL}
+    {-1,            NULL}
 };
 
 static PciChipsets VBOXPCIchipsets[] = {
   { VBOX_DEVICEID, VBOX_DEVICEID, RES_SHARED_VGA },
-  { -1,         -1,                 RES_UNDEFINED },
+  { -1,            -1,            RES_UNDEFINED },
 };
 
@@ -199 +199 @@
 /* No options for now */
 static const OptionInfoRec VBOXOptions[] = {
-    { -1,               NULL,           OPTV_NONE,      {0},    FALSE }
+    { -1, NULL, OPTV_NONE, {0}, FALSE }
 };
 
@@ -391 +391 @@
     /* We always like modes specified by the user in the configuration
      * file and modes requested by the host, as doing otherwise is likely to
-         * annoy people. */
+     * annoy people. */
     if (   !(mode->type & M_T_USERDEF)
         && !(mode->type & M_T_PREFERRED)
@@ -576 +576 @@
     0,                          /* Module minor version. Xorg-specific */
     1,                          /* Module patchlevel. Xorg-specific */
-    ABI_CLASS_VIDEODRV,         /* This is a video driver */
+    ABI_CLASS_VIDEODRV,         /* This is a video driver */
     ABI_VIDEODRV_VERSION,
     MOD_CLASS_VIDEODRV,
@@ -1131 +1131 @@
     /* colourmap code */
     if (!miCreateDefColormap(pScreen))
-        return (FALSE);
+        return (FALSE);
 
     if(!xf86HandleColormaps(pScreen, 256, 8, vboxLoadPalette, NULL, 0))

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -102 +102 @@
 #include "xf86Cursor.h"
 
-#define VBOX_VERSION            4000  /* Why? */
-#define VBOX_NAME                     "VBoxVideo"
-#define VBOX_DRIVER_NAME          "vboxvideo"
+#define VBOX_VERSION            4000  /* Why? */
+#define VBOX_NAME               "VBoxVideo"
+#define VBOX_DRIVER_NAME        "vboxvideo"
 
 #ifdef VBOX_DRI

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -251 +251 @@
         sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
             ((pciConfigPtr)pVBox->pciInfo->thisCard)->busnum,
-                ((pciConfigPtr)pVBox->pciInfo->thisCard)->devnum,
+            ((pciConfigPtr)pVBox->pciInfo->thisCard)->devnum,
             ((pciConfigPtr)pVBox->pciInfo->thisCard)->funcnum);
 #endif