Index: /trunk/.scm-settings
===================================================================
--- /trunk/.scm-settings	(revision 53623)
+++ /trunk/.scm-settings	(revision 53624)
@@ -67,5 +67,5 @@
 --filter-out-dirs  "*/src/VBox/Devices/Graphics/vmsvga_glext/."
 --filter-out-dirs  "*/src/VBox/Devices/PC/ipxe/*/."
---filter-out-dirs  "*/src/VBox/Devices/EFI/Firmware/*/."
+--filter-out-dirs  "*/src/VBox/Devices/EFI/Firmware*/."
 --filter-out-dirs  "*/src/VBox/Devices/Network/lwip*/src*/."
 --filter-out-dirs  "*/src/VBox/Devices/Network/lwip*/doc*/."
@@ -86,5 +86,4 @@
 --filter-out-files "*/include/VBox/HostServices/wglext.h"
 --filter-out-files "*/src/VBox/Devices/Audio/sys-queue.h"
---filter-out-files "*/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_strfunc.h"
 --filter-out-files "*/src/VBox/HostDrivers/VBoxUSB/os2/usbcalls.h"
 --filter-out-files "*/src/VBox/RDP/x11server/Init*.c"
Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 53623)
+++ /trunk/Config.kmk	(revision 53624)
@@ -2667,5 +2667,5 @@
    VBOX_CERTIFICATE_SUBJECT_NAME_ARGS ?= /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)" /a
    # TEMPORARY HACK!
-   if defined(VBOX_ONLY_VALIDATIONKIT) 
+   if defined(VBOX_ONLY_VALIDATIONKIT)
     VBOX_CROSS_CERTIFICATE_FILE ?= $(VBOX_PATH_SELFSIGN)/MSCV-VSClass3.cer
    else
Index: /trunk/include/VBox/shflsvc.h
===================================================================
--- /trunk/include/VBox/shflsvc.h	(revision 53623)
+++ /trunk/include/VBox/shflsvc.h	(revision 53624)
@@ -194,5 +194,5 @@
     const uint32_t u32HeaderSize = SHFLSTRING_HEADER_SIZE;
 
-    /* 
+    /*
      * Check that the buffer size is big enough to hold a zero sized string
      * and is not too big to fit into 16 bit variables.
Index: /trunk/include/iprt/asn1-generator-sanity.h
===================================================================
--- /trunk/include/iprt/asn1-generator-sanity.h	(revision 53623)
+++ /trunk/include/iprt/asn1-generator-sanity.h	(revision 53624)
@@ -27,3 +27,2 @@
 #include <iprt/asn1-generator-pass.h>
 
-
Index: /trunk/include/iprt/avl.h
===================================================================
--- /trunk/include/iprt/avl.h	(revision 53623)
+++ /trunk/include/iprt/avl.h	(revision 53624)
@@ -487,5 +487,5 @@
 typedef PPAVLGCPTRNODECORE    PAVLGCPTRTREE;
 
-/** Callback function for RTAvlGCPtrDoWithAll(). 
+/** Callback function for RTAvlGCPtrDoWithAll().
  *  @returns IPRT status codes. */
 typedef DECLCALLBACK(int)   AVLGCPTRCALLBACK(PAVLGCPTRNODECORE pNode, void *pvUser);
Index: /trunk/include/iprt/cpp/ministring.h
===================================================================
--- /trunk/include/iprt/cpp/ministring.h	(revision 53623)
+++ /trunk/include/iprt/cpp/ministring.h	(revision 53624)
@@ -881,5 +881,5 @@
      *
      * Exception safe.
-     * 
+     *
      * @param   a_rThat  The string to swap with.
      */
Index: /trunk/include/iprt/crypto/rsa.h
===================================================================
--- /trunk/include/iprt/crypto/rsa.h	(revision 53623)
+++ /trunk/include/iprt/crypto/rsa.h	(revision 53624)
@@ -146,3 +146,2 @@
 #endif
 
-
Index: /trunk/include/iprt/crypto/tsp.h
===================================================================
--- /trunk/include/iprt/crypto/tsp.h	(revision 53623)
+++ /trunk/include/iprt/crypto/tsp.h	(revision 53624)
@@ -134,3 +134,2 @@
 #endif
 
-
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk	(revision 53623)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk	(revision 53624)
@@ -123,5 +123,5 @@
    VBoxVideoWddm_SOURCES   += \
 	$(PATH_ROOT)/src/VBox/GuestHost/OpenGL/util/sortarray.cpp
- 	
+
  if defined(VBOX_WITH_CROGL)
    VBoxVideoWddm_SOURCES   += \
Index: /trunk/src/VBox/Additions/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/Makefile.kmk	(revision 53623)
+++ /trunk/src/VBox/Additions/linux/Makefile.kmk	(revision 53624)
@@ -489,3 +489,2 @@
 		/bin/sh ./install.sh "\$$0 1> /dev/null"
 
-
Index: /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h
===================================================================
--- /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h	(revision 53623)
+++ /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h	(revision 53624)
@@ -66,5 +66,5 @@
  * sfprov_unmount() unmounts the mounted file system. It returns 0 on
  * success and any relevant errno on failure.
- * 
+ *
  * spf_mount_t is the representation of an active mount point.
  */
Index: /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c
===================================================================
--- /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c	(revision 53623)
+++ /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c	(revision 53624)
@@ -240,5 +240,5 @@
 }
 
-static void 
+static void
 sffs_print(sffs_data_t *sffs)
 {
Index: /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp	(revision 53623)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp	(revision 53624)
@@ -304,5 +304,5 @@
     VBClServiceDefaultHandler, /* pause */
     VBClServiceDefaultHandler, /* resume */
-    VBClServiceDefaultCleanup    
+    VBClServiceDefaultCleanup
 };
 
Index: /trunk/src/VBox/Additions/x11/VBoxClient/display.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/display.cpp	(revision 53623)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/display.cpp	(revision 53624)
@@ -319,5 +319,5 @@
     struct DISPLAYSERVICE *pSelf = getClassFromInterface(ppInterface);
     int rc;
-    
+
     if (pSelf->mfInit)
         return VERR_WRONG_ORDER;
@@ -376,5 +376,5 @@
     pause,
     resume,
-    cleanup    
+    cleanup
 };
 
Index: /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp	(revision 53623)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp	(revision 53624)
@@ -2416,5 +2416,5 @@
     VBClServiceDefaultHandler, /* pause */
     VBClServiceDefaultHandler, /* resume */
-    VBClServiceDefaultCleanup    
+    VBClServiceDefaultCleanup
 };
 
Index: /trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp	(revision 53623)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp	(revision 53624)
@@ -204,5 +204,5 @@
     VBClServiceDefaultHandler, /* pause */
     VBClServiceDefaultHandler, /* resume */
-    VBClServiceDefaultCleanup    
+    VBClServiceDefaultCleanup
 };
 
Index: /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp	(revision 53623)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp	(revision 53624)
@@ -209,5 +209,5 @@
     Display *pDisplay;
     bool fHasVT = true;
-    
+
     pDisplay = XOpenDisplay(NULL);
     if (!pDisplay)
Index: /trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp	(revision 53623)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp	(revision 53624)
@@ -413,5 +413,5 @@
     pause,
     resume,
-    cleanup    
+    cleanup
 };
 
Index: /trunk/src/VBox/Additions/x11/VBoxClient/seamless.h
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/seamless.h	(revision 53623)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/seamless.h	(revision 53624)
@@ -63,5 +63,5 @@
      */
     int cancelEvent(void);
-    
+
     /** Thread function to monitor X11 window configuration changes. */
     static DECLCALLBACK(int) x11MonitorThread(RTTHREAD self, void *pvUser);
@@ -72,5 +72,5 @@
     /** Helper to stop the X11 monitor thread again. */
     int stopX11MonitorThread(void);
-    
+
     /** Is the service currently actively monitoring X11 windows? */
     bool isX11MonitorThreadRunning()
Index: /trunk/src/VBox/Additions/x11/vboxvideo/getmode.c
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/getmode.c	(revision 53623)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/getmode.c	(revision 53624)
@@ -281,5 +281,5 @@
         return;
     }
-#endif    
+#endif
     /* We can get called early, before the root window is created. */
     if (!ROOT_WINDOW(pScrn))
Index: /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 53624)
@@ -2092,5 +2092,5 @@
 
             /*
-             * For now we always set the driver at LUN 0 as our primary 
+             * For now we always set the driver at LUN 0 as our primary
              * host backend. This might change in the future.
              */
@@ -2100,5 +2100,5 @@
             LogFunc(("LUN #%u: pCon=%p, drvFlags=0x%x\n",
                      uLUN, pDrv->pConnector, pDrv->Flags));
-           
+
             pThis->paDrv[uLUN] = pDrv;
             pThis->cLUNs++;
@@ -2273,11 +2273,11 @@
             size_t len = 0;
             if (!pCon->pfnIsInputOK (pCon, pDrv->pStrmIn))
-                len = RTStrPrintf(szMissingStreams, 
+                len = RTStrPrintf(szMissingStreams,
                                   sizeof(szMissingStreams), "PCM Input");
             if (!pCon->pfnIsOutputOK(pCon, pDrv->pStrmOut))
-                len += RTStrPrintf(szMissingStreams + len, 
+                len += RTStrPrintf(szMissingStreams + len,
                                    sizeof(szMissingStreams) - len, len ? ", PCM Output" : "PCM Output");
             if (!pCon->pfnIsInputOK (pCon, pDrv->pStrmMic))
-                len += RTStrPrintf(szMissingStreams + len, 
+                len += RTStrPrintf(szMissingStreams + len,
                                    sizeof(szMissingStreams) - len, len ? ", PCM Mic" : "PCM Mic");
 
Index: /trunk/src/VBox/Devices/Audio/DevIchHda.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevIchHda.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Audio/DevIchHda.cpp	(revision 53624)
@@ -2044,5 +2044,5 @@
     AssertMsg((cbCopied == pBdle->cbUnderFifoW + cbArranged2Copy), /* we assume that we write the entire buffer including unreported bytes */
               ("cbCopied=%RU32 != pBdle->cbUnderFifoW=%RU32 + cbArranged2Copy=%RU32\n",
-               cbCopied, pBdle->cbUnderFifoW, cbArranged2Copy)); 
+               cbCopied, pBdle->cbUnderFifoW, cbArranged2Copy));
     if (   pBdle->cbUnderFifoW
         && pBdle->cbUnderFifoW <= cbCopied)
@@ -2300,5 +2300,5 @@
             for (uint8_t lun = 0; lun < 1; lun++)
             {
-# endif 
+# endif
                 rc = pThis->paDrv[lun]->pConnector->pfnWrite(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pGstStrmOut,
                                                              pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW,
@@ -3562,5 +3562,5 @@
 
             /*
-             * For now we always set the driver at LUN 0 as our primary 
+             * For now we always set the driver at LUN 0 as our primary
              * host backend. This might change in the future.
              */
Index: /trunk/src/VBox/Devices/Audio/DrvAudio.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DrvAudio.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Audio/DrvAudio.cpp	(revision 53624)
@@ -682,5 +682,5 @@
     if (RT_FAILURE(rc))
     {
-        LogFunc(("Failed to add host audio input stream \"%s\", rc=%Rrc\n", 
+        LogFunc(("Failed to add host audio input stream \"%s\", rc=%Rrc\n",
                  pszName, rc));
 
@@ -1593,5 +1593,5 @@
 }
 
-static DECLCALLBACK(bool) drvAudioIsInputOK(PPDMIAUDIOCONNECTOR pInterface, 
+static DECLCALLBACK(bool) drvAudioIsInputOK(PPDMIAUDIOCONNECTOR pInterface,
                                             PPDMAUDIOGSTSTRMIN  pGstStrmIn)
 {
@@ -1599,5 +1599,5 @@
 }
 
-static DECLCALLBACK(bool) drvAudioIsOutputOK(PPDMIAUDIOCONNECTOR pInterface, 
+static DECLCALLBACK(bool) drvAudioIsOutputOK(PPDMIAUDIOCONNECTOR pInterface,
                                              PPDMAUDIOGSTSTRMOUT pGstStrmOut)
 {
@@ -1769,5 +1769,5 @@
         }
 #endif
-    }   
+    }
 
     LogFlowFuncLeaveRC(rc);
Index: /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp	(revision 53624)
@@ -103,5 +103,5 @@
 } OSSAUDIOCFG, *POSSAUDIOCFG;
 
-static OSSAUDIOCFG s_OSSConf = 
+static OSSAUDIOCFG s_OSSConf =
 {
 #ifndef RT_OS_L4
@@ -156,5 +156,5 @@
 }
 
-static int drvHostOSSAudioOSSToFmt(int fmt, 
+static int drvHostOSSAudioOSSToFmt(int fmt,
                                    PDMAUDIOFMT *pFmt, PDMAUDIOENDIANESS *pEndianess)
 {
@@ -213,5 +213,5 @@
     if (close(*phFile))
     {
-        LogRel(("OSS: Closing descriptor failed: %s\n", 
+        LogRel(("OSS: Closing descriptor failed: %s\n",
                 strerror(errno)));
         rc = VERR_GENERAL_FAILURE; /** @todo */
@@ -226,5 +226,5 @@
 }
 
-static int drvHostOSSAudioOpen(bool fIn, 
+static int drvHostOSSAudioOpen(bool fIn,
                                POSSAUDIOSTREAMCFG pReq, POSSAUDIOSTREAMCFG pObt,
                                int *phFile)
@@ -237,10 +237,10 @@
     int hFile;
 
-    do 
+    do
     {
         const char *pszDev = fIn ? s_OSSConf.devpath_in : s_OSSConf.devpath_out;
         if (!pszDev)
         {
-            LogRel(("OSS: Invalid or no %s device name set\n", 
+            LogRel(("OSS: Invalid or no %s device name set\n",
                     fIn ? "input" : "output"));
             rc = VERR_INVALID_PARAMETER;
@@ -249,5 +249,5 @@
 
         hFile = open(pszDev, (fIn ? O_RDONLY : O_WRONLY) | O_NONBLOCK);
-        if (hFile == -1) 
+        if (hFile == -1)
         {
             LogRel(("OSS: Failed to open %s: %s\n", pszDev, strerror(errno)));
@@ -257,5 +257,5 @@
 
         int iFormat = drvHostOSSAudioFmtToOSS(pReq->enmFormat);
-        if (ioctl(hFile, SNDCTL_DSP_SAMPLESIZE, &iFormat)) 
+        if (ioctl(hFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
         {
             LogRel(("OSS: Failed to set audio format to %ld\n",
@@ -264,7 +264,7 @@
             break;
         }
-        
+
         int cChannels = pReq->cChannels;
-        if (ioctl(hFile, SNDCTL_DSP_CHANNELS, &cChannels)) 
+        if (ioctl(hFile, SNDCTL_DSP_CHANNELS, &cChannels))
         {
             LogRel(("OSS: Failed to set number of audio channels (%d): %s\n",
@@ -275,7 +275,7 @@
 
         int freq = pReq->uFreq;
-        if (ioctl(hFile, SNDCTL_DSP_SPEED, &freq)) 
-        {
-            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s\n", 
+        if (ioctl(hFile, SNDCTL_DSP_SPEED, &freq))
+        {
+            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s\n",
                     pReq->uFreq, strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
@@ -285,5 +285,5 @@
         /* Obsolete on Solaris (using O_NONBLOCK is sufficient). */
 #if !(defined(VBOX) && defined(RT_OS_SOLARIS))
-        if (ioctl(hFile, SNDCTL_DSP_NONBLOCK)) 
+        if (ioctl(hFile, SNDCTL_DSP_NONBLOCK))
         {
             LogRel(("OSS: Failed to set non-blocking mode: %s\n",
@@ -294,5 +294,5 @@
 #endif
         int mmmmssss = (pReq->cFragments << 16) | lsbindex(pReq->cbFragmentSize);
-        if (ioctl(hFile, SNDCTL_DSP_SETFRAGMENT, &mmmmssss)) 
+        if (ioctl(hFile, SNDCTL_DSP_SETFRAGMENT, &mmmmssss))
         {
             LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s\n",
@@ -303,6 +303,6 @@
 
         audio_buf_info abinfo;
-        if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, 
-                  &abinfo)) 
+        if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE,
+                  &abinfo))
         {
             LogRel(("OSS: Failed to retrieve buffer length: %s\n", strerror(errno)));
@@ -311,7 +311,7 @@
         }
 
-        rc = drvHostOSSAudioOSSToFmt(iFormat, 
+        rc = drvHostOSSAudioOSSToFmt(iFormat,
                                      &pObt->enmFormat, &pObt->enmEndianess);
-        if (RT_SUCCESS(rc)) 
+        if (RT_SUCCESS(rc))
         {
             pObt->cChannels      = cChannels;
@@ -323,7 +323,7 @@
         }
     }
-    while (0); 
-
-    if (RT_FAILURE(rc)) 
+    while (0);
+
+    if (RT_FAILURE(rc))
         drvHostOSSAudioClose(&hFile);
 
@@ -364,11 +364,11 @@
         case PDMAUDIOSTREAMCMD_ENABLE:
         {
-            audio_pcm_info_clear_buf(&pHstStrmOut->Props, 
+            audio_pcm_info_clear_buf(&pHstStrmOut->Props,
                                      pThisStrmOut->pvPCMBuf, audioMixBufSize(&pHstStrmOut->MixBuf));
 
             mask = PCM_ENABLE_OUTPUT;
-            if (ioctl(pThisStrmOut->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0) 
-            {
-                LogRel(("OSS: Failed to enable output stream: %s\n", 
+            if (ioctl(pThisStrmOut->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0)
+            {
+                LogRel(("OSS: Failed to enable output stream: %s\n",
                         strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
@@ -381,7 +381,7 @@
         {
             mask = 0;
-            if (ioctl(pThisStrmOut->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0) 
-            {
-                LogRel(("OSS: Failed to disable output stream: %s\n", 
+            if (ioctl(pThisStrmOut->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0)
+            {
+                LogRel(("OSS: Failed to disable output stream: %s\n",
                        strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
@@ -419,5 +419,5 @@
 
     int rc = VINF_SUCCESS;
-    size_t cbToRead = RT_MIN(pThisStrmIn->cbBuf, 
+    size_t cbToRead = RT_MIN(pThisStrmIn->cbBuf,
                              audioMixBufFreeBytes(&pHstStrmIn->MixBuf));
 
@@ -429,5 +429,5 @@
     size_t   offWrite = 0;
 
-    while (cbToRead) 
+    while (cbToRead)
     {
         cbTemp = RT_MIN(cbToRead, pThisStrmIn->cbBuf);
@@ -438,7 +438,7 @@
                      cbRead, cbTemp, cbToRead));
 
-        if (cbRead < 0) 
-        {
-            switch (errno) 
+        if (cbRead < 0)
+        {
+            switch (errno)
             {
                 case 0:
@@ -455,5 +455,5 @@
 
                 default:
-                    LogFlowFunc(("Failed to read %zu input frames, rc=%Rrc\n", 
+                    LogFlowFunc(("Failed to read %zu input frames, rc=%Rrc\n",
                                  cbTemp, rc));
                     rc = VERR_GENERAL_FAILURE; /** @todo */
@@ -466,6 +466,6 @@
         else if (cbRead)
         {
-            uint32_t cWritten;  
-            rc = audioMixBufWriteCirc(&pHstStrmIn->MixBuf, 
+            uint32_t cWritten;
+            rc = audioMixBufWriteCirc(&pHstStrmIn->MixBuf,
                                       pThisStrmIn->pvBuf, cbRead,
                                       &cWritten);
@@ -514,5 +514,5 @@
     LogFlowFuncEnter();
 
-    if (pThisStrmIn->pvBuf) 
+    if (pThisStrmIn->pvBuf)
     {
         RTMemFree(pThisStrmIn->pvBuf);
@@ -533,7 +533,7 @@
 
 #ifndef RT_OS_L4
-    if (!pThisStrmOut->fMemMapped) 
-    {
-        if (pThisStrmOut->pvPCMBuf) 
+    if (!pThisStrmOut->fMemMapped)
+    {
+        if (pThisStrmOut->pvPCMBuf)
         {
             RTMemFree(pThisStrmOut->pvPCMBuf);
@@ -583,11 +583,11 @@
         reqStream.cbFragmentSize = s_OSSConf.fragsize;
 
-        rc = drvHostOSSAudioOpen(true /* fIn */, 
+        rc = drvHostOSSAudioOpen(true /* fIn */,
                                  &reqStream, &obtStream, &hFile);
         if (RT_SUCCESS(rc))
         {
-            if (obtStream.cFragments * obtStream.cbFragmentSize & pHstStrmIn->Props.uAlign) 
+            if (obtStream.cFragments * obtStream.cbFragmentSize & pHstStrmIn->Props.uAlign)
                 LogRel(("OSS: Warning: Misaligned DAC output buffer: Size = %zu, Alignment = %u\n",
-                        obtStream.cFragments * obtStream.cbFragmentSize, 
+                        obtStream.cFragments * obtStream.cbFragmentSize,
                         pHstStrmIn->Props.uAlign + 1));
 
@@ -601,7 +601,7 @@
 
             rc = drvAudioStreamCfgToProps(&streamCfg, &pHstStrmIn->Props);
-            if (RT_SUCCESS(rc)) 
-            {
-                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) 
+            if (RT_SUCCESS(rc))
+            {
+                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize)
                            >> pHstStrmIn->Props.cShift;
                 if (!cSamples)
@@ -610,9 +610,9 @@
         }
 
-        if (RT_SUCCESS(rc)) 
+        if (RT_SUCCESS(rc))
         {
             size_t cbBuf = cSamples * (1 << pHstStrmIn->Props.cShift);
             pThisStrmIn->pvBuf = RTMemAlloc(cbBuf);
-            if (!pThisStrmIn->pvBuf) 
+            if (!pThisStrmIn->pvBuf)
             {
                 LogRel(("OSS: Failed allocating ADC buffer with %RU32 samples, each %d bytes\n",
@@ -629,7 +629,7 @@
     } while (0);
 
-    if (RT_FAILURE(rc)) 
+    if (RT_FAILURE(rc))
         drvHostOSSAudioClose(&hFile);
-            
+
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -660,11 +660,11 @@
         reqStream.cbFragmentSize = s_OSSConf.fragsize;
 
-        rc = drvHostOSSAudioOpen(false /* fIn */, 
+        rc = drvHostOSSAudioOpen(false /* fIn */,
                                  &reqStream, &obtStream, &hFile);
         if (RT_SUCCESS(rc))
         {
-            if (obtStream.cFragments * obtStream.cbFragmentSize & pHstStrmOut->Props.uAlign) 
+            if (obtStream.cFragments * obtStream.cbFragmentSize & pHstStrmOut->Props.uAlign)
                 LogRel(("OSS: Warning: Misaligned DAC output buffer: Size = %zu, Alignment = %u\n",
-                        obtStream.cFragments * obtStream.cbFragmentSize, 
+                        obtStream.cFragments * obtStream.cbFragmentSize,
                         pHstStrmOut->Props.uAlign + 1));
 
@@ -678,7 +678,7 @@
 
             rc = drvAudioStreamCfgToProps(&streamCfg, &pHstStrmOut->Props);
-            if (RT_SUCCESS(rc)) 
-                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize) 
-                           >> pHstStrmOut->Props.cShift;  
+            if (RT_SUCCESS(rc))
+                cSamples = (obtStream.cFragments * obtStream.cbFragmentSize)
+                           >> pHstStrmOut->Props.cShift;
         }
 
@@ -687,31 +687,31 @@
 #ifndef RT_OS_L4
             pThisStrmOut->fMemMapped = false;
-            if (s_OSSConf.try_mmap) 
+            if (s_OSSConf.try_mmap)
             {
                 pThisStrmOut->pvPCMBuf = mmap(0, cSamples << pHstStrmOut->Props.cShift,
                                               PROT_READ | PROT_WRITE, MAP_SHARED, hFile, 0);
-                if (pThisStrmOut->pvPCMBuf == MAP_FAILED) 
+                if (pThisStrmOut->pvPCMBuf == MAP_FAILED)
                 {
-                    LogRel(("OSS: Failed to memory map %zu bytes of DAC output file: %s\n", 
+                    LogRel(("OSS: Failed to memory map %zu bytes of DAC output file: %s\n",
                             cSamples << pHstStrmOut->Props.cShift, strerror(errno)));
                     rc = RTErrConvertFromErrno(errno);
                     break;
                 }
-                else 
+                else
                 {
                     int mask = 0;
-                    if (ioctl(hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0) 
+                    if (ioctl(hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0)
                     {
-                        LogRel(("OSS: Failed to retrieve initial trigger mask: %s\n", 
+                        LogRel(("OSS: Failed to retrieve initial trigger mask: %s\n",
                                 strerror(errno)));
                         rc = RTErrConvertFromErrno(errno);
                         /* Note: No break here, need to unmap file first! */
                     }
-                    else 
+                    else
                     {
                         mask = PCM_ENABLE_OUTPUT;
-                        if (ioctl (hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0) 
+                        if (ioctl (hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0)
                         {
-                            LogRel(("OSS: Failed to retrieve PCM_ENABLE_OUTPUT mask: %s\n", 
+                            LogRel(("OSS: Failed to retrieve PCM_ENABLE_OUTPUT mask: %s\n",
                                     strerror(errno)));
                             rc = RTErrConvertFromErrno(errno);
@@ -722,10 +722,10 @@
                     }
 
-                    if (!pThisStrmOut->fMemMapped) 
+                    if (!pThisStrmOut->fMemMapped)
                     {
-                        int rc2 = munmap(pThisStrmOut->pvPCMBuf, 
+                        int rc2 = munmap(pThisStrmOut->pvPCMBuf,
                                          cSamples << pHstStrmOut->Props.cShift);
                         if (rc2)
-                            LogRel(("OSS: Failed to unmap DAC output file: %s\n", 
+                            LogRel(("OSS: Failed to unmap DAC output file: %s\n",
                                     strerror(errno)));
 
@@ -738,10 +738,10 @@
             /* Memory mapping failed above? Try allocating an own buffer. */
 #ifndef RT_OS_L4
-            if (!pThisStrmOut->fMemMapped) 
+            if (!pThisStrmOut->fMemMapped)
             {
 #endif
                 LogFlowFunc(("cSamples=%RU32\n", cSamples));
                 pThisStrmOut->pvPCMBuf = RTMemAlloc(cSamples * (1 << pHstStrmOut->Props.cShift));
-                if (!pThisStrmOut->pvPCMBuf) 
+                if (!pThisStrmOut->pvPCMBuf)
                 {
                     LogRel(("OSS: Failed allocating DAC buffer with %RU32 samples, each %d bytes\n",
@@ -759,7 +759,7 @@
     } while (0);
 
-    if (RT_FAILURE(rc)) 
+    if (RT_FAILURE(rc))
         drvHostOSSAudioClose(&hFile);
-            
+
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -782,16 +782,16 @@
         size_t cbBuf = audioMixBufSizeBytes(&pHstStrmOut->MixBuf);
 
-        uint32_t cLive = drvAudioHstOutSamplesLive(pHstStrmOut, 
+        uint32_t cLive = drvAudioHstOutSamplesLive(pHstStrmOut,
                                                    NULL /* pcStreamsLive */);
         uint32_t cToRead;
 
 #ifndef RT_OS_L4
-        if (pThisStrmOut->fMemMapped) 
+        if (pThisStrmOut->fMemMapped)
         {
             /* Get current playback pointer. */
             int rc2 = ioctl(pThisStrmOut->hFile, SNDCTL_DSP_GETOPTR, &cntinfo);
-            if (!rc2) 
-            {
-                LogRel(("OSS: Failed to retrieve current playback pointer: %s\n", 
+            if (!rc2)
+            {
+                LogRel(("OSS: Failed to retrieve current playback pointer: %s\n",
                         strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
@@ -800,5 +800,5 @@
 
             /* Nothing to play? */
-            if (cntinfo.ptr == pThisStrmOut->old_optr) 
+            if (cntinfo.ptr == pThisStrmOut->old_optr)
                 break;
 
@@ -810,15 +810,15 @@
             Assert(cbData);
 
-            cToRead = RT_MIN((uint32_t)AUDIOMIXBUF_B2S(&pHstStrmOut->MixBuf, cbData), 
+            cToRead = RT_MIN((uint32_t)AUDIOMIXBUF_B2S(&pHstStrmOut->MixBuf, cbData),
                              cLive);
         }
-        else 
+        else
         {
 #endif
             audio_buf_info abinfo;
             int rc2 = ioctl(pThisStrmOut->hFile, SNDCTL_DSP_GETOSPACE, &abinfo);
-            if (rc2 < 0) 
-            {
-                LogRel(("OSS: Failed to retrieve current playback buffer: %s\n", 
+            if (rc2 < 0)
+            {
+                LogRel(("OSS: Failed to retrieve current playback buffer: %s\n",
                         strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
@@ -826,5 +826,5 @@
             }
 
-            if ((size_t)abinfo.bytes > cbBuf) 
+            if ((size_t)abinfo.bytes > cbBuf)
             {
                 LogFlowFunc(("Warning: Invalid available size, size=%d, bufsize=%d\n",
@@ -842,5 +842,5 @@
             }
 
-            cToRead = RT_MIN((uint32_t)AUDIOMIXBUF_B2S(&pHstStrmOut->MixBuf, abinfo.bytes), 
+            cToRead = RT_MIN((uint32_t)AUDIOMIXBUF_B2S(&pHstStrmOut->MixBuf, abinfo.bytes),
                              cLive);
             if (!cToRead)
@@ -855,5 +855,5 @@
         while (cbToRead)
         {
-            rc = audioMixBufReadCirc(&pHstStrmOut->MixBuf, 
+            rc = audioMixBufReadCirc(&pHstStrmOut->MixBuf,
                                      pThisStrmOut->pvPCMBuf, cbToRead, &cRead);
             if (RT_FAILURE(rc))
@@ -861,7 +861,7 @@
 
             cbRead = AUDIOMIXBUF_S2B(&pHstStrmOut->MixBuf, cRead);
-            ssize_t cbWritten = write(pThisStrmOut->hFile, pThisStrmOut->pvPCMBuf, 
+            ssize_t cbWritten = write(pThisStrmOut->hFile, pThisStrmOut->pvPCMBuf,
                                       cbRead);
-            if (cbWritten == -1) 
+            if (cbWritten == -1)
             {
                 LogRel(("OSS: Failed writing output data %s\n", strerror(errno)));
@@ -886,5 +886,5 @@
     } while(0);
 
-    if (RT_SUCCESS(rc)) 
+    if (RT_SUCCESS(rc))
     {
         uint32_t cReadTotal = AUDIOMIXBUF_B2S(&pHstStrmOut->MixBuf, cbReadTotal);
@@ -895,5 +895,5 @@
             *pcSamplesPlayed = cReadTotal;
 
-        LogFlowFunc(("cReadTotal=%RU32 (%RU32 bytes), rc=%Rrc\n", 
+        LogFlowFunc(("cReadTotal=%RU32 (%RU32 bytes), rc=%Rrc\n",
                      cReadTotal, cbReadTotal, rc));
     }
Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp	(revision 53624)
@@ -72,5 +72,5 @@
 *******************************************************************************/
 /* 64-bit GMR descriptor */
-typedef struct 
+typedef struct
 {
    RTGCPHYS GCPhys;
@@ -97,5 +97,5 @@
         SVGAGMRImageFormat  format;
     } GMRFB;
-    struct 
+    struct
     {
         bool                fActive;
@@ -169,5 +169,5 @@
     SSMFIELD_ENTRY_IGN_HCPTR(       VMSVGAState, p3dState),
     SSMFIELD_ENTRY_IGN_HCPTR(       VMSVGAState, pFrameBufferBackup),
-    SSMFIELD_ENTRY_IGN_HCPTR(       VMSVGAState, pFIFOExtCmdParam),    
+    SSMFIELD_ENTRY_IGN_HCPTR(       VMSVGAState, pFIFOExtCmdParam),
     SSMFIELD_ENTRY_IGN_GCPHYS(      VMSVGAState, GCPhysFIFO),
     SSMFIELD_ENTRY_IGNORE(          VMSVGAState, cbFIFO),
@@ -459,5 +459,5 @@
  *
  * @param   pInterface          Pointer to this interface.
- * @param   
+ * @param
  * @param   uScreenId           The screen updates are for.
  * @param   x                   The upper left corner x coordinate of the new viewport rectangle
@@ -908,5 +908,5 @@
     pThis->last_width       = pThis->svga.uWidth;
     pThis->last_height      = pThis->svga.uHeight;
-    
+
     ASMAtomicOrU32(&pThis->svga.u32ActionFlags, VMSVGA_ACTION_CHANGEMODE);
 
@@ -938,5 +938,5 @@
     {
     case SVGA_REG_ID:
-        if (    u32 == SVGA_ID_0 
+        if (    u32 == SVGA_ID_0
             ||  u32 == SVGA_ID_1
             ||  u32 == SVGA_ID_2)
@@ -956,5 +956,5 @@
 
 #ifdef IN_RING3
-        if (    u32 == 1 
+        if (    u32 == 1
             &&  pThis->svga.fEnabled == false)
         {
@@ -1085,7 +1085,7 @@
             &&  pThis->svga.fConfigured)
         {
-#ifdef IN_RING3        
+#ifdef IN_RING3
             Log(("SVGA_REG_SYNC: SVGA_FIFO_BUSY=%d\n", pThis->svga.pFIFOR3[SVGA_FIFO_BUSY]));
-            pThis->svga.fBusy = true;  
+            pThis->svga.fBusy = true;
             pThis->svga.pFIFOR3[SVGA_FIFO_BUSY] = pThis->svga.fBusy;
 
@@ -1233,5 +1233,5 @@
             break; /* nothing to do */
 
-#ifdef IN_RING3        
+#ifdef IN_RING3
         vmsvgaSetTraces(pThis, !!u32);
 #else
@@ -1393,5 +1393,5 @@
  */
 static int vmsvgaFIFOAccess(PVM pVM, PVGASTATE pThis, RTGCPHYS GCPhys, bool fWriteAccess)
-{   
+{
     RTGCPHYS GCPhysOffset = GCPhys - pThis->svga.GCPhysFIFO;
     uint32_t *pFIFO = pThis->svga.pFIFOR3;
@@ -1783,5 +1783,5 @@
             for (uint32_t j = 0; j < pGMR->numDescriptors; j++)
             {
-                if (    GCPhys >= pGMR->paDesc[j].GCPhys 
+                if (    GCPhys >= pGMR->paDesc[j].GCPhys
                     &&  GCPhys < pGMR->paDesc[j].GCPhys + pGMR->paDesc[j].numPages * PAGE_SIZE)
                 {
@@ -1856,5 +1856,5 @@
         }
     }
-    return VINF_SUCCESS;   
+    return VINF_SUCCESS;
 }
 #endif /* IN_RING3 */
@@ -2071,5 +2071,5 @@
 
             case SVGA_CMD_FENCE:
-            {                
+            {
                 SVGAFifoCmdFence *pCmdFence = (SVGAFifoCmdFence *)vmsvgaFIFOGetCmdBuffer(pThread, pFIFO, sizeof(SVGAFifoCmdFence), &size, &pBounceBuffer);
 
@@ -2475,5 +2475,5 @@
 
                 Log(("vmsvgaFIFOLoop: SVGA_CMD_ANNOTATION_FILL red=%x green=%x blue=%x\n", pCmd->color.s.r, pCmd->color.s.g, pCmd->color.s.b));
-                pSVGAState->colorAnnotation = pCmd->color; 
+                pSVGAState->colorAnnotation = pCmd->color;
                 break;
             }
@@ -2573,5 +2573,5 @@
                         cRects = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGASignedRect);
                         rc = vmsvga3dSurfaceBlitToScreen(pThis, pCmd->destScreenId, pCmd->destRect, pCmd->srcImage, pCmd->srcRect, cRects, (SVGASignedRect *)(pCmd + 1));
-                        break;                
+                        break;
                     }
 
@@ -2922,5 +2922,5 @@
         else
         {
-            for(uint32_t i = 0; i < cHeight; i++) 
+            for(uint32_t i = 0; i < cHeight; i++)
             {
                 memcpy(pDest, pSrc, cbWidth);
@@ -2940,5 +2940,5 @@
     AssertReturn(src.offset < pGMR->cbTotal, VERR_INVALID_PARAMETER);
     AssertReturn(cbSrcOffset + cbSrcPitch * (cHeight - 1) + cbWidth <= pGMR->cbTotal, VERR_INVALID_PARAMETER);
-    
+
     for (unsigned i = 0; i < cHeight; i++)
     {
@@ -2958,10 +2958,10 @@
         {
             unsigned cbToCopy;
-            
-            if (uCurrentOffset + cbCurrentWidth <= uDescOffset + pDesc->numPages * PAGE_SIZE) 
+
+            if (uCurrentOffset + cbCurrentWidth <= uDescOffset + pDesc->numPages * PAGE_SIZE)
             {
                 cbToCopy = cbCurrentWidth;
             }
-            else 
+            else
             {
                 cbToCopy = (uDescOffset + pDesc->numPages * PAGE_SIZE - uCurrentOffset);
@@ -3171,5 +3171,5 @@
 
         rc = SSMR3GetStructEx(pSSM, pGMR, sizeof(*pGMR), 0, g_aGMRFields, NULL);
-        AssertRCReturn(rc, rc); 
+        AssertRCReturn(rc, rc);
 
         if (pGMR->numDescriptors)
@@ -3200,5 +3200,5 @@
         pThis->svga.u8FIFOExtCommand = VMSVGA_FIFO_EXTCMD_LOADSTATE;
         pThis->svga.pFIFOExtCmdParam = (void *)&loadstate;
-        /* Hack alert: resume the IO thread as it has been suspended before the destruct callback. 
+        /* Hack alert: resume the IO thread as it has been suspended before the destruct callback.
          * The PowerOff notification isn't working, so not an option in this case.
          */
@@ -3291,5 +3291,5 @@
         pThis->svga.u8FIFOExtCommand = VMSVGA_FIFO_EXTCMD_SAVESTATE;
         pThis->svga.pFIFOExtCmdParam = (void *)pSSM;
-        /* Hack alert: resume the IO thread as it has been suspended before the destruct callback. 
+        /* Hack alert: resume the IO thread as it has been suspended before the destruct callback.
          * The PowerOff notification isn't working, so not an option in this case.
          */
@@ -3375,5 +3375,5 @@
     /* Stop the FIFO thread. */
     pThis->svga.u8FIFOExtCommand = VMSVGA_FIFO_EXTCMD_TERMINATE;
-    /* Hack alert: resume the IO thread as it has been suspended before the destruct callback. 
+    /* Hack alert: resume the IO thread as it has been suspended before the destruct callback.
      * The PowerOff notification isn't working, so not an option in this case.
      */
@@ -3501,5 +3501,5 @@
     STAM_REG(pVM, &pSVGAState->StatR3CmdDrawPrimitive, STAMTYPE_PROFILE, "/Devices/VMSVGA/3d/Cmd/DrawPrimitive",  STAMUNIT_TICKS_PER_CALL, "Profiling of DrawPrimitive.");
     STAM_REG(pVM, &pSVGAState->StatR3CmdSurfaceDMA,    STAMTYPE_PROFILE, "/Devices/VMSVGA/3d/Cmd/SurfaceDMA",  STAMUNIT_TICKS_PER_CALL, "Profiling of SurfaceDMA.");
-   
+
     return VINF_SUCCESS;
 }
Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp	(revision 53624)
@@ -195,5 +195,5 @@
     uint32_t                idAssociatedContext;
     uint32_t                flags;
-    SVGA3dSurfaceFormat     format; 
+    SVGA3dSurfaceFormat     format;
     GLint                   internalFormatGL;
     GLint                   formatGL;
@@ -207,5 +207,5 @@
     SVGA3dSurfaceFace       faces[SVGA3D_MAX_SURFACE_FACES];
     uint32_t                cFaces;
-    PVMSVGA3DMIPMAPLEVEL    pMipmapLevels; 
+    PVMSVGA3DMIPMAPLEVEL    pMipmapLevels;
     uint32_t                multiSampleCount;
     SVGA3dTextureFilter     autogenFilter;
@@ -760,5 +760,5 @@
     if (pState->fGLVersion >= 3.1) /* darwin: Requires GL 3.1, so triggers on older mac os x versions. */
 #endif
-        VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext); 
+        VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
     glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &pState->caps.maxTextures);
     VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
@@ -787,5 +787,5 @@
     pState->caps.fS3TCSupported = vmsvga3dCheckGLExtension("GL_EXT_texture_compression_s3tc");
 
-    /* http://http://www.opengl.org/wiki/Detecting_the_Shader_Model 
+    /* http://http://www.opengl.org/wiki/Detecting_the_Shader_Model
      * ARB Assembly Language
      * These are done through testing the presence of extensions. You should test them in this order:
@@ -1003,5 +1003,5 @@
 
     /* @todo missing:
-     * 
+     *
      * SVGA3DFORMAT_OP_PIXELSIZE
      */
@@ -1012,5 +1012,5 @@
     case SVGA3D_DEVCAP_SURFACEFMT_X1R5G5B5:
     case SVGA3D_DEVCAP_SURFACEFMT_R5G6B5:
-        result |= SVGA3DFORMAT_OP_MEMBEROFGROUP_ARGB 
+        result |= SVGA3DFORMAT_OP_MEMBEROFGROUP_ARGB
                |  SVGA3DFORMAT_OP_CONVERT_TO_ARGB
                |  SVGA3DFORMAT_OP_DISPLAYMODE           /* Should not be set for alpha formats. */
@@ -1022,5 +1022,5 @@
     case SVGA3D_DEVCAP_SURFACEFMT_A1R5G5B5:
     case SVGA3D_DEVCAP_SURFACEFMT_A4R4G4B4:
-        result |=     SVGA3DFORMAT_OP_MEMBEROFGROUP_ARGB 
+        result |=     SVGA3DFORMAT_OP_MEMBEROFGROUP_ARGB
                   |   SVGA3DFORMAT_OP_CONVERT_TO_ARGB
                   |   SVGA3DFORMAT_OP_SAME_FORMAT_UP_TO_ALPHA_RENDERTARGET;
@@ -1626,5 +1626,5 @@
     AssertReturn(pState, VERR_NO_MEMORY);
 
-    Log(("vmsvga3dSurfaceDefine: sid=%x surfaceFlags=%x format=%s (%x) multiSampleCount=%d autogenFilter=%d, cMipLevels=%d size=(%d,%d,%d)\n", 
+    Log(("vmsvga3dSurfaceDefine: sid=%x surfaceFlags=%x format=%s (%x) multiSampleCount=%d autogenFilter=%d, cMipLevels=%d size=(%d,%d,%d)\n",
          sid, surfaceFlags, vmsvgaSurfaceType2String(format), format, multisampleCount, autogenFilter, cMipLevels, pMipLevelSize->width, pMipLevelSize->height, pMipLevelSize->depth));
 
@@ -1657,5 +1657,5 @@
     pSurface->oglId.buffer = OPENGL_INVALID_ID;
 
-    /* The surface type is sort of undefined now, even though the hints and format can help to clear that up. 
+    /* The surface type is sort of undefined now, even though the hints and format can help to clear that up.
      * In some case we'll have to wait until the surface is used to create the D3D object.
      */
@@ -1783,5 +1783,5 @@
         break;
     }
-   
+
     /* Allocate buffer to hold the surface data until we can move it into a D3D object */
     for (uint32_t iFace=0; iFace < pSurface->cFaces; iFace++)
@@ -1962,12 +1962,12 @@
                 Log(("vmsvga3dCreateTexture: sync dirty texture mipmap level %d (pitch %x)\n", i, pSurface->pMipmapLevels[i].cbSurfacePitch));
 
-                glTexImage2D(GL_TEXTURE_2D, 
-                             i, 
-                             pSurface->internalFormatGL, 
-                             pSurface->pMipmapLevels[i].size.width, 
-                             pSurface->pMipmapLevels[i].size.height, 
-                             0, 
-                             pSurface->formatGL, 
-                             pSurface->typeGL, 
+                glTexImage2D(GL_TEXTURE_2D,
+                             i,
+                             pSurface->internalFormatGL,
+                             pSurface->pMipmapLevels[i].size.width,
+                             pSurface->pMipmapLevels[i].size.height,
+                             0,
+                             pSurface->formatGL,
+                             pSurface->typeGL,
                              pSurface->pMipmapLevels[i].pSurfaceData);
 
@@ -1981,12 +1981,12 @@
     else
         /* Reserve texture memory. */
-        glTexImage2D(GL_TEXTURE_2D, 
-                     0, 
-                     pSurface->internalFormatGL, 
-                     pSurface->pMipmapLevels[0].size.width, 
-                     pSurface->pMipmapLevels[0].size.height, 
-                     0, 
+        glTexImage2D(GL_TEXTURE_2D,
+                     0,
+                     pSurface->internalFormatGL,
+                     pSurface->pMipmapLevels[0].size.width,
+                     pSurface->pMipmapLevels[0].size.height,
+                     0,
                      pSurface->formatGL,
-                     pSurface->typeGL, 
+                     pSurface->typeGL,
                      NULL);
 
@@ -2066,6 +2066,6 @@
     VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
 
-    Log(("src conv. (%d,%d)(%d,%d); dest conv (%d,%d)(%d,%d)\n", srcBox.x, D3D_TO_OGL_Y_COORD(pSurfaceSrc, srcBox.y + srcBox.h),     
-         srcBox.x + srcBox.w, D3D_TO_OGL_Y_COORD(pSurfaceSrc, srcBox.y), destBox.x, D3D_TO_OGL_Y_COORD(pSurfaceDest, destBox.y + destBox.h),  
+    Log(("src conv. (%d,%d)(%d,%d); dest conv (%d,%d)(%d,%d)\n", srcBox.x, D3D_TO_OGL_Y_COORD(pSurfaceSrc, srcBox.y + srcBox.h),
+         srcBox.x + srcBox.w, D3D_TO_OGL_Y_COORD(pSurfaceSrc, srcBox.y), destBox.x, D3D_TO_OGL_Y_COORD(pSurfaceDest, destBox.y + destBox.h),
          destBox.x + destBox.w, D3D_TO_OGL_Y_COORD(pSurfaceDest, destBox.y)));
 
@@ -2090,5 +2090,5 @@
                                   destBox.x + destBox.w,                                    /* exclusive. */
 #ifdef MANUAL_FLIP_SURFACE_DATA
-                                  D3D_TO_OGL_Y_COORD(pSurfaceDest, destBox.y),              /* exclusive */                         
+                                  D3D_TO_OGL_Y_COORD(pSurfaceDest, destBox.y),              /* exclusive */
 #else
                                   destBox.y + destBox.h,
@@ -2162,5 +2162,5 @@
 #ifdef MANUAL_FLIP_SURFACE_DATA
             pBufferStart =    (uint8_t *)pMipLevel->pSurfaceData
-                            + pBoxes[i].x * pSurface->cbBlock 
+                            + pBoxes[i].x * pSurface->cbBlock
                             + pMipLevel->cbSurface - pBoxes[i].y * pMipLevel->cbSurfacePitch
                             - pMipLevel->cbSurfacePitch;      /* flip image during copy */
@@ -2168,11 +2168,11 @@
             pBufferStart = (uint8_t *)pMipLevel->pSurfaceData + uDestOffset;
 #endif
-            rc = vmsvgaGMRTransfer(pThis, 
+            rc = vmsvgaGMRTransfer(pThis,
                                     transfer,
                                     pBufferStart,
 #ifdef MANUAL_FLIP_SURFACE_DATA
-                                    -(int32_t)pMipLevel->cbSurfacePitch, 
+                                    -(int32_t)pMipLevel->cbSurfacePitch,
 #else
-                                    (int32_t)pMipLevel->cbSurfacePitch, 
+                                    (int32_t)pMipLevel->cbSurfacePitch,
 #endif
                                     guest.ptr,
@@ -2255,6 +2255,6 @@
                     glGetTexImage(GL_TEXTURE_2D,
                                   host.mipmap,
-                                  pSurface->formatGL, 
-                                  pSurface->typeGL, 
+                                  pSurface->formatGL,
+                                  pSurface->typeGL,
                                   pDoubleBuffer);
                     VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
@@ -2270,7 +2270,7 @@
 
 #ifdef MANUAL_FLIP_SURFACE_DATA
-                    pBufferStart =   pDoubleBuffer 
-                                   + pBoxes[i].x * pSurface->cbBlock 
-                                   + pMipLevel->cbSurface - pBoxes[i].y * cbSurfacePitch 
+                    pBufferStart =   pDoubleBuffer
+                                   + pBoxes[i].x * pSurface->cbBlock
+                                   + pMipLevel->cbSurface - pBoxes[i].y * cbSurfacePitch
                                    - cbSurfacePitch;      /* flip image during copy */
 #else
@@ -2288,5 +2288,5 @@
                 }
 
-                rc = vmsvgaGMRTransfer(pThis, 
+                rc = vmsvgaGMRTransfer(pThis,
                                        transfer,
                                        pBufferStart,
@@ -2329,6 +2329,6 @@
                                     pBoxes[i].w,
                                     pBoxes[i].h,
-                                    pSurface->formatGL, 
-                                    pSurface->typeGL, 
+                                    pSurface->formatGL,
+                                    pSurface->typeGL,
                                     pDoubleBuffer);
 
@@ -2375,8 +2375,8 @@
                 Log(("Lock %s memory for rectangle (%d,%d)(%d,%d)\n", (fVertex) ? "vertex" : "index", pBoxes[i].x, pBoxes[i].y, pBoxes[i].x + pBoxes[i].w, pBoxes[i].y + pBoxes[i].h));
 
-                rc = vmsvgaGMRTransfer(pThis, 
+                rc = vmsvgaGMRTransfer(pThis,
                                        transfer,
-                                       pData + uDestOffset, 
-                                       pMipLevel->cbSurfacePitch, 
+                                       pData + uDestOffset,
+                                       pMipLevel->cbSurfacePitch,
                                        guest.ptr,
                                        pBoxes[i].srcx * pSurface->cbBlock + pBoxes[i].srcy * cbSrcPitch,
@@ -2425,5 +2425,5 @@
         SVGA3dCopyBox        box;
         SVGA3dGuestImage     dst;
-       
+
         box.x       = destRect.left;
         box.y       = destRect.top;
@@ -2461,5 +2461,5 @@
         /* @todo merge into one SurfaceDMA call */
         for (uint32_t i = 0; i < cRects; i++)
-        {   
+        {
             /* The clipping rectangle is relative to the top-left corner of srcRect & destRect. Adjust here. */
             box.srcx = srcRect.left + pRect[i].left;
@@ -2537,5 +2537,5 @@
 
     /* Generate the mip maps. */
-    pState->ext.glGenerateMipmap(GL_TEXTURE_2D);    
+    pState->ext.glGenerateMipmap(GL_TEXTURE_2D);
     VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
 
@@ -2554,5 +2554,5 @@
     PVMSVGA3DCONTEXT    pContext;
     uint32_t            cid;
-    struct 
+    struct
     {
         uint32_t        x;
@@ -2951,6 +2951,6 @@
     pContext->hdc   = GetDC(pContext->hwnd);
     AssertMsgReturn(pContext->hdc, ("GetDC %x failed with %d\n", pContext->hwnd, GetLastError()), VERR_INTERNAL_ERROR);
-    
-    PIXELFORMATDESCRIPTOR pfd = { 
+
+    PIXELFORMATDESCRIPTOR pfd = {
         sizeof(PIXELFORMATDESCRIPTOR),  /*  size of this pfd */
         1,                              /* version number */
@@ -2971,5 +2971,5 @@
         0,                              /* reserved */
         0, 0, 0                         /* layer masks ignored */
-    }; 
+    };
     int     pixelFormat;
     BOOL    ret;
@@ -2984,5 +2984,5 @@
 
     pContext->hglrc = wglCreateContext(pContext->hdc);
-    AssertMsgReturn(pContext->hglrc, ("wglCreateContext %x failed with %d\n", pContext->hdc, GetLastError()), VERR_INTERNAL_ERROR);    
+    AssertMsgReturn(pContext->hglrc, ("wglCreateContext %x failed with %d\n", pContext->hdc, GetLastError()), VERR_INTERNAL_ERROR);
 
     // TODO isn't this default on Linux since OpenGL 1.1?
@@ -3021,5 +3021,5 @@
 
     if (pState->display == NULL)
-    { 
+    {
         /* get an X display and make sure we have glX 1.3 */
         pState->display = XOpenDisplay(0);
@@ -3235,5 +3235,5 @@
             CREATESTRUCT          cs;
 
-            memset(&cs, 0, sizeof(cs));            
+            memset(&cs, 0, sizeof(cs));
             cs.cx = pThis->svga.uWidth;
             cs.cy = pThis->svga.uHeight;
@@ -3473,5 +3473,5 @@
     case SVGA3D_CMP_ALWAYS:
         return GL_ALWAYS;
-    default: 
+    default:
         AssertFailed();
         return GL_LESS;
@@ -3526,5 +3526,5 @@
     {
         GLenum enableCap = ~0U;
-        Log(("vmsvga3dSetRenderState: cid=%d state=%s (%d) val=%x\n", cid, vmsvga3dGetRenderStateName(pRenderState[i].state), pRenderState[i].state, pRenderState[i].uintValue));        
+        Log(("vmsvga3dSetRenderState: cid=%d state=%s (%d) val=%x\n", cid, vmsvga3dGetRenderStateName(pRenderState[i].state), pRenderState[i].state, pRenderState[i].uintValue));
         /* Save the render state for vm state saving. */
         if (pRenderState[i].state < SVGA3D_RS_MAX)
@@ -3533,5 +3533,5 @@
         switch (pRenderState[i].state)
         {
-        case SVGA3D_RS_ZENABLE:                /* SVGA3dBool */    
+        case SVGA3D_RS_ZENABLE:                /* SVGA3dBool */
             enableCap = GL_DEPTH_TEST;
             val = pRenderState[i].uintValue;
@@ -3862,5 +3862,5 @@
         case SVGA3D_RS_BLENDEQUATION:          /* SVGA3dBlendEquation */
             if (pContext->state.aRenderState[SVGA3D_RS_SEPARATEALPHABLENDENABLE].uintValue != 0)
-                pState->ext.glBlendEquationSeparate(vmsvga3dBlendEquation2GL(pContext->state.aRenderState[SVGA3D_RS_BLENDEQUATION].uintValue), 
+                pState->ext.glBlendEquationSeparate(vmsvga3dBlendEquation2GL(pContext->state.aRenderState[SVGA3D_RS_BLENDEQUATION].uintValue),
                                                     vmsvga3dBlendEquation2GL(pContext->state.aRenderState[SVGA3D_RS_BLENDEQUATIONALPHA].uintValue));
             else
@@ -4398,7 +4398,7 @@
             VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
 
-            pState->ext.glRenderbufferStorage(GL_RENDERBUFFER, 
-                                              pRenderTarget->internalFormatGL, 
-                                              pRenderTarget->pMipmapLevels[0].size.width, 
+            pState->ext.glRenderbufferStorage(GL_RENDERBUFFER,
+                                              pRenderTarget->internalFormatGL,
+                                              pRenderTarget->pMipmapLevels[0].size.width,
                                               pRenderTarget->pMipmapLevels[0].size.height);
             VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
@@ -4596,5 +4596,5 @@
         return GL_CLAMP_TO_EDGE_SGIS; /* @todo correct? */
 
-    case SVGA3D_TEX_ADDRESS_EDGE:        
+    case SVGA3D_TEX_ADDRESS_EDGE:
     case SVGA3D_TEX_ADDRESS_INVALID:
     default:
@@ -4814,5 +4814,5 @@
             VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
             break;
-            
+
         case SVGA3D_TS_TEXTURE_MIPMAP_LEVEL:        /* uint32_t */
             textureType = GL_TEXTURE_MAX_LEVEL;
@@ -4820,10 +4820,10 @@
             break;
 
-#if 0      
+#if 0
         case SVGA3D_TS_TEXTURE_ANISOTROPIC_LEVEL:   /* uint32_t */
             samplerType = D3DSAMP_MAXANISOTROPY;
             val = pTextureState[i].value;   /* Identical?? */
             break;
-            
+
         case SVGA3D_TS_GAMMA:                       /* float */
             samplerType = D3DSAMP_SRGBTEXTURE;
@@ -4833,5 +4833,5 @@
             else
                 val = TRUE;
-            break;           
+            break;
 #endif
         /* Internal commands, that don't map directly to the SetTextureStageState API. */
@@ -4935,6 +4935,6 @@
         AssertFailed();
 
-    if (    pData->attenuation0 < 0.0f 
-        ||  pData->attenuation1 < 0.0f 
+    if (    pData->attenuation0 < 0.0f
+        ||  pData->attenuation1 < 0.0f
         ||  pData->attenuation2 < 0.0f)
     {
@@ -4954,5 +4954,5 @@
     if (pData->range * pData->range >= FLT_MIN)
         QuadAttenuation = 1.4f / (pData->range * pData->range);
-    else 
+    else
         QuadAttenuation = 0.0f;
 
@@ -4970,12 +4970,12 @@
         glLightfv(GL_LIGHT0 + index, GL_POSITION, position);
         VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
-        
+
         glLightf(GL_LIGHT0 + index, GL_SPOT_CUTOFF, 180.0f);
         VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
-        
+
         /* Attenuation - Are these right? guessing... */
         glLightf(GL_LIGHT0 + index, GL_CONSTANT_ATTENUATION, pData->attenuation0);
         VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
-        
+
         glLightf(GL_LIGHT0 + index, GL_LINEAR_ATTENUATION, pData->attenuation1);
         VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
@@ -5025,9 +5025,9 @@
              */
             exponent = 0.0f;
-        } 
-        else 
+        }
+        else
         {
             float rho = pData->theta + (pData->phi - pData->theta) / (2 * pData->falloff);
-            if (rho < 0.0001f) 
+            if (rho < 0.0001f)
                 rho = 0.0001f;
             exponent = -0.3f/log(cos(rho/2));
@@ -5045,5 +5045,5 @@
         glLightf(GL_LIGHT0 + index, GL_CONSTANT_ATTENUATION, pData->attenuation0);
         VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
-        
+
         glLightf(GL_LIGHT0 + index, GL_LINEAR_ATTENUATION, pData->attenuation1);
         VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
@@ -5089,5 +5089,5 @@
 
 int vmsvga3dSetLightEnabled(PVGASTATE pThis, uint32_t cid, uint32_t index, uint32_t enabled)
-{    
+{
     PVMSVGA3DCONTEXT      pContext;
     PVMSVGA3DSTATE        pState = (PVMSVGA3DSTATE)pThis->svga.p3dState;
@@ -5577,5 +5577,5 @@
             }
         }
-       
+
 #ifdef LOG_ENABLED
         if (pVertexDecl[iVertex].array.stride == 0)
@@ -5735,5 +5735,5 @@
 
             if (    sidIndex >= SVGA3D_MAX_SURFACE_IDS
-                ||  sidIndex >= pState->cSurfaces 
+                ||  sidIndex >= pState->cSurfaces
                 ||  pState->paSurface[sidIndex].id != sidIndex)
             {
@@ -5787,18 +5787,18 @@
             Assert(pRange[iPrimitive].indexBias >= 0);  /* @todo */
             Assert(pRange[iPrimitive].indexWidth == pRange[iPrimitive].indexArray.stride);
-           
+
             /* Render with an index buffer */
             Log(("DrawIndexedPrimitive %x cPrimitives=%d cVertices=%d hint.first=%d hint.last=%d index offset=%d primitivecount=%d index width=%d index bias=%d\n", modeDraw, pRange[iPrimitive].primitiveCount, cVertices, pVertexDecl[0].rangeHint.first,  pVertexDecl[0].rangeHint.last,  pRange[iPrimitive].indexArray.offset, pRange[iPrimitive].primitiveCount,  pRange[iPrimitive].indexWidth, pRange[iPrimitive].indexBias));
             if (pRange[iPrimitive].indexBias == 0)
             {
-                glDrawElements(modeDraw, 
+                glDrawElements(modeDraw,
                                cVertices,
-                               (pRange[iPrimitive].indexWidth == sizeof(uint16_t)) ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, 
+                               (pRange[iPrimitive].indexWidth == sizeof(uint16_t)) ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT,
                                (GLvoid *)(pRange[iPrimitive].indexArray.offset));   /* byte offset in indices buffer */
             }
             else
-                pState->ext.glDrawElementsBaseVertex(modeDraw, 
-                                                     cVertices, 
-                                                     (pRange[iPrimitive].indexWidth == sizeof(uint16_t)) ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, 
+                pState->ext.glDrawElementsBaseVertex(modeDraw,
+                                                     cVertices,
+                                                     (pRange[iPrimitive].indexWidth == sizeof(uint16_t)) ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT,
                                                      (GLvoid *)(pRange[iPrimitive].indexArray.offset),   /* byte offset in indices buffer */
                                                      pRange[iPrimitive].indexBias);        /* basevertex */
@@ -6196,5 +6196,2 @@
 }
 
-
-
-
Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp	(revision 53624)
@@ -146,7 +146,7 @@
                 pCS->cy = rectClient.bottom - rectClient.top;
 #endif
-                *pHwnd = CreateWindowEx(pCS->dwExStyle, 
-                                        VMSVGA3D_WNDCLASSNAME, 
-                                        pCS->lpszName, 
+                *pHwnd = CreateWindowEx(pCS->dwExStyle,
+                                        VMSVGA3D_WNDCLASSNAME,
+                                        pCS->lpszName,
                                         pCS->style,
 #ifdef DEBUG_GFX_WINDOW
@@ -154,18 +154,18 @@
                                         0,
 #else
-                                        pCS->x, 
-                                        pCS->y, 
+                                        pCS->x,
+                                        pCS->y,
 #endif
-                                        pCS->cx, 
+                                        pCS->cx,
                                         pCS->cy,
 #ifdef DEBUG_GFX_WINDOW
                                         0,
 #else
-                                        pCS->hwndParent, 
+                                        pCS->hwndParent,
 #endif
-                                        pCS->hMenu, 
-                                        pCS->hInstance, 
+                                        pCS->hMenu,
+                                        pCS->hInstance,
                                         NULL);
-                AssertMsg(*pHwnd, ("CreateWindowEx %x %s %s %x (%d,%d)(%d,%d), %x %x %x error=%x\n", pCS->dwExStyle, pCS->lpszName, VMSVGA3D_WNDCLASSNAME, pCS->style, pCS->x, 
+                AssertMsg(*pHwnd, ("CreateWindowEx %x %s %s %x (%d,%d)(%d,%d), %x %x %x error=%x\n", pCS->dwExStyle, pCS->lpszName, VMSVGA3D_WNDCLASSNAME, pCS->style, pCS->x,
                                     pCS->y, pCS->cx, pCS->cy,pCS->hwndParent, pCS->hMenu, pCS->hInstance, GetLastError()));
 
@@ -577,5 +577,5 @@
     switch (state)
     {
-    case SVGA3D_RS_ZENABLE:                /* SVGA3dBool */            
+    case SVGA3D_RS_ZENABLE:                /* SVGA3dBool */
         return "SVGA3D_RS_ZENABLE";
     case SVGA3D_RS_ZWRITEENABLE:           /* SVGA3dBool */
Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h	(revision 53624)
@@ -221,5 +221,5 @@
                 pMipmapLevel->pSurfaceData = RTMemAllocZ(pMipmapLevel->cbSurface);
                 AssertReturn(pMipmapLevel->pSurfaceData, VERR_NO_MEMORY);
-                
+
                 /* Fetch the data present boolean first. */
                 rc = SSMR3GetBool(pSSM, &fDataPresent);
@@ -575,5 +575,5 @@
                                                                     D3DLOCK_READONLY);
                             AssertMsgReturn(hr == D3D_OK, ("vmsvga3dSaveExec: LockRect failed with %x\n", hr), VERR_INTERNAL_ERROR);
-               
+
                             /* Copy the data one line at a time in case the internal pitch is different. */
                             for (uint32_t j = 0; j < pMipmapLevel->size.height; j++)
@@ -608,5 +608,5 @@
                             if (fVertex)
                                 hr = pSurface->u.pVertexBuffer->Lock(0, 0, (void **)&pD3DData, D3DLOCK_READONLY);
-                            else        
+                            else
                                 hr = pSurface->u.pIndexBuffer->Lock(0, 0, (void **)&pD3DData, D3DLOCK_READONLY);
                             AssertMsg(hr == D3D_OK, ("vmsvga3dSaveExec: Lock %s failed with %x\n", (fVertex) ? "vertex" : "index", hr));
@@ -691,6 +691,6 @@
                             glGetTexImage(GL_TEXTURE_2D,
                                           i,
-                                          pSurface->formatGL, 
-                                          pSurface->typeGL, 
+                                          pSurface->formatGL,
+                                          pSurface->typeGL,
                                           pData);
                             VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp	(revision 53624)
@@ -106,8 +106,8 @@
     uint32_t                idAssociatedContext;
     uint32_t                flags;
-    SVGA3dSurfaceFormat     format; 
+    SVGA3dSurfaceFormat     format;
     SVGA3dSurfaceFace       faces[SVGA3D_MAX_SURFACE_FACES];
     uint32_t                cFaces;
-    PVMSVGA3DMIPMAPLEVEL    pMipmapLevels; 
+    PVMSVGA3DMIPMAPLEVEL    pMipmapLevels;
     uint32_t                multiSampleCount;
     SVGA3dTextureFilter     autogenFilter;
@@ -333,5 +333,5 @@
     IDirect3D9Ex           *pD3D9;
 #endif
-    D3DCAPS9                caps; 
+    D3DCAPS9                caps;
 
     /** Window Thread. */
@@ -378,5 +378,5 @@
 } VMSVGA3DFORMATSUPPORT;
 
-VMSVGA3DFORMATSUPPORT aFormatSupport[] = 
+VMSVGA3DFORMATSUPPORT aFormatSupport[] =
 {
     {
@@ -437,5 +437,5 @@
 };
 
-VMSVGA3DFORMATSUPPORT aFeatureReject[] = 
+VMSVGA3DFORMATSUPPORT aFeatureReject[] =
 {
     {
@@ -453,5 +453,5 @@
         D3DRTYPE_TEXTURE, /* ?? */
         SVGA3DFORMAT_OP_NOALPHABLEND
-    },    
+    },
 };
 
@@ -518,5 +518,5 @@
 
     /* Check if INTZ is supported. */
-    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                           D3DDEVTYPE_HAL,
                                           D3DFMT_X8R8G8B8,    /* assume standard 32-bit display mode */
@@ -533,5 +533,5 @@
 
     /* Check if NULL is supported. */
-    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                           D3DDEVTYPE_HAL,
                                           D3DFMT_X8R8G8B8,    /* assume standard 32-bit display mode */
@@ -549,5 +549,5 @@
 
     /*  Check if DX9 depth stencil textures are supported */
-    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                           D3DDEVTYPE_HAL,
                                           D3DFMT_X8R8G8B8,    /* assume standard 32-bit display mode */
@@ -560,5 +560,5 @@
     }
 
-    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                           D3DDEVTYPE_HAL,
                                           D3DFMT_X8R8G8B8,    /* assume standard 32-bit display mode */
@@ -570,5 +570,5 @@
         LogRel(("VMSVGA: texture format D3DFMT_D24X8 not supported\n"));
     }
-    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+    hr = pState->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                           D3DDEVTYPE_HAL,
                                           D3DFMT_X8R8G8B8,    /* assume standard 32-bit display mode */
@@ -636,5 +636,5 @@
 
     /* Try if the format can be used for the primary display. */
-    hr = pState3D->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+    hr = pState3D->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                             D3DDEVTYPE_HAL,
                                             format,
@@ -645,5 +645,5 @@
     for (unsigned i = 0; i < RT_ELEMENTS(aFormatSupport); i++)
     {
-        hr = pState3D->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+        hr = pState3D->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                                 D3DDEVTYPE_HAL,
                                                 D3DFMT_X8R8G8B8,    /* assume standard 32-bit display mode */
@@ -660,5 +660,5 @@
         for (unsigned i = 0; i < RT_ELEMENTS(aFeatureReject); i++)
         {
-            hr = pState3D->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+            hr = pState3D->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                                     D3DDEVTYPE_HAL,
                                                     D3DFMT_X8R8G8B8,    /* assume standard 32-bit display mode */
@@ -672,5 +672,5 @@
 
     /* @todo missing:
-     * 
+     *
      * SVGA3DFORMAT_OP_PIXELSIZE
      */
@@ -681,5 +681,5 @@
     case SVGA3D_DEVCAP_SURFACEFMT_X1R5G5B5:
     case SVGA3D_DEVCAP_SURFACEFMT_R5G6B5:
-        result |= SVGA3DFORMAT_OP_MEMBEROFGROUP_ARGB 
+        result |= SVGA3DFORMAT_OP_MEMBEROFGROUP_ARGB
                |  SVGA3DFORMAT_OP_CONVERT_TO_ARGB
                |  SVGA3DFORMAT_OP_DISPLAYMODE           /* Should not be set for alpha formats. */
@@ -691,5 +691,5 @@
     case SVGA3D_DEVCAP_SURFACEFMT_A1R5G5B5:
     case SVGA3D_DEVCAP_SURFACEFMT_A4R4G4B4:
-        result |= SVGA3DFORMAT_OP_MEMBEROFGROUP_ARGB 
+        result |= SVGA3DFORMAT_OP_MEMBEROFGROUP_ARGB
                |  SVGA3DFORMAT_OP_CONVERT_TO_ARGB
                |  SVGA3DFORMAT_OP_SAME_FORMAT_UP_TO_ALPHA_RENDERTARGET;
@@ -706,6 +706,6 @@
     HRESULT  hr;
     uint32_t result = 0;
-        
-    hr = pState3D->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT, 
+
+    hr = pState3D->pD3D9->CheckDeviceFormat(D3DADAPTER_DEFAULT,
                                             D3DDEVTYPE_HAL,
                                             D3DFMT_X8R8G8B8,    /* assume standard 32-bit display mode */
@@ -714,5 +714,5 @@
                                             format);
     if (hr == D3D_OK)
-        result =  SVGA3DFORMAT_OP_ZSTENCIL 
+        result =  SVGA3DFORMAT_OP_ZSTENCIL
                 | SVGA3DFORMAT_OP_ZSTENCIL_WITH_ARBITRARY_COLOR_DEPTH
                 | SVGA3DFORMAT_OP_TEXTURE /* Necessary for Ubuntu Unity */;
@@ -1115,5 +1115,5 @@
     switch (idx3dCaps)
     {
-    case 0: 
+    case 0:
         *pu32Val = 0x00000001;
         break;
@@ -1121,5 +1121,5 @@
         *pu32Val = 0x0000000a;
         break;
-    case 2: 
+    case 2:
         *pu32Val = 0x00000008;
         break;
@@ -1384,6 +1384,6 @@
     PVMSVGA3DSTATE   pState = (PVMSVGA3DSTATE)pThis->svga.p3dState;
     AssertReturn(pState, VERR_NO_MEMORY);
-   
-    Log(("vmsvga3dSurfaceDefine: sid=%x surfaceFlags=%x format=%s (%x) multiSampleCount=%d autogenFilter=%d, cMipLevels=%d size=(%d,%d,%d)\n", 
+
+    Log(("vmsvga3dSurfaceDefine: sid=%x surfaceFlags=%x format=%s (%x) multiSampleCount=%d autogenFilter=%d, cMipLevels=%d size=(%d,%d,%d)\n",
          sid, surfaceFlags, vmsvgaSurfaceType2String(format), format, multisampleCount, autogenFilter, cMipLevels, pMipLevelSize->width, pMipLevelSize->height, pMipLevelSize->depth));
 
@@ -1415,5 +1415,5 @@
     pSurface->pSharedObjectTree     = NULL;
 
-    /* The surface type is sort of undefined now, even though the hints and format can help to clear that up. 
+    /* The surface type is sort of undefined now, even though the hints and format can help to clear that up.
      * In some case we'll have to wait until the surface is used to create the D3D object.
      */
@@ -1552,5 +1552,5 @@
         break;
     }
-   
+
     Assert(!pSurface->u.pSurface);
 
@@ -1575,5 +1575,5 @@
 
 /*
- * Release all shared surface objects. 
+ * Release all shared surface objects.
  */
 static int vmsvga3dSharedSurfaceDestroyTree(PAVLU32NODECORE pNode, void *pParam)
@@ -1706,11 +1706,11 @@
         bool    ret;
 
-        Log(("vmsvga3dSurfaceGetSharedCopy: Create shared texture copy d3d (%d,%d) cMip=%d usage %x format %x.\n", 
-              pSurface->pMipmapLevels[0].size.width, 
-              pSurface->pMipmapLevels[0].size.height, 
-              pSurface->faces[0], 
+        Log(("vmsvga3dSurfaceGetSharedCopy: Create shared texture copy d3d (%d,%d) cMip=%d usage %x format %x.\n",
+              pSurface->pMipmapLevels[0].size.width,
+              pSurface->pMipmapLevels[0].size.height,
+              pSurface->faces[0],
               pSurface->fUsageD3D | D3DUSAGE_RENDERTARGET,
               pSurface->formatD3D));
-            
+
         pSharedSurface = (PVMSVGA3DSHAREDSURFACE)RTMemAllocZ(sizeof(*pSharedSurface));
         AssertReturn(pSharedSurface, NULL);
@@ -1721,7 +1721,7 @@
 
         /* Create shadow copy of the original shared texture. Shared d3d resources require Vista+ and have some restrictions. */
-        hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width, 
-                                              pSurface->pMipmapLevels[0].size.height, 
-                                              pSurface->faces[0].numMipLevels, 
+        hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width,
+                                              pSurface->pMipmapLevels[0].size.height,
+                                              pSurface->faces[0].numMipLevels,
                                               pSurface->fUsageD3D | D3DUSAGE_RENDERTARGET /* required for use as a StretchRect destination */,
                                               pSurface->formatD3D,
@@ -1738,5 +1738,5 @@
 #define vmsvga3dSurfaceFlush(a, b)
 #else
-/* Inject a query event into the D3D pipeline so we can check when usage of this surface has finished. 
+/* Inject a query event into the D3D pipeline so we can check when usage of this surface has finished.
  * (D3D does not synchronize shared surface usage)
  */
@@ -1860,5 +1860,5 @@
         cid = pSurfaceDest->idAssociatedContext;
         if (    cid >= pState->cContexts
-            ||  pState->paContext[cid].id != cid)   
+            ||  pState->paContext[cid].id != cid)
         {
             Log(("vmsvga3dSurfaceCopy invalid context id!\n"));
@@ -1872,5 +1872,5 @@
 
 #ifndef VBOX_VMSVGA3D_WITH_OPENGL
-        if (    fSrcTexture 
+        if (    fSrcTexture
             &&  pSurfaceSrc->idAssociatedContext != cid)
         {
@@ -1961,5 +1961,5 @@
 
         Log(("vmsvga3dSurfaceCopy: (manual) copy src=%x src=%x face=%d (%d,%d)(%d,%d) to dest=%x src=%x face=%d (%d,%d)\n", sidSrc, src.face, src.mipmap, Rect.left, Rect.top, Rect.right, Rect.bottom, sidDest, dest.face, dest.mipmap, pBox[i].x, pBox[i].y));
-            
+
         Assert(!pBox[i].srcz && !pBox[i].z);
 
@@ -2060,6 +2060,6 @@
         Assert(pSurface->faces[0].numMipLevels == 1);
         /* Use the INTZ format for a depth/stencil surface that will be used as a texture */
-        hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width, 
-                                              pSurface->pMipmapLevels[0].size.height, 
+        hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width,
+                                              pSurface->pMipmapLevels[0].size.height,
                                               1,
                                               D3DUSAGE_DEPTHSTENCIL,
@@ -2075,7 +2075,7 @@
     else
     {
-        hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width, 
-                                              pSurface->pMipmapLevels[0].size.height, 
-                                              pSurface->faces[0].numMipLevels, 
+        hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width,
+                                              pSurface->pMipmapLevels[0].size.height,
+                                              pSurface->faces[0].numMipLevels,
                                               pSurface->fUsageD3D | D3DUSAGE_RENDERTARGET /* required for use as a StretchRect destination */,
                                               pSurface->formatD3D,
@@ -2085,8 +2085,8 @@
         if (hr == D3D_OK)
         {
-            /* Create another texture object to serve as a bounce buffer as the above texture surface can't be locked. */ 
-            hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width, 
-                                                  pSurface->pMipmapLevels[0].size.height, 
-                                                  pSurface->faces[0].numMipLevels, 
+            /* Create another texture object to serve as a bounce buffer as the above texture surface can't be locked. */
+            hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width,
+                                                  pSurface->pMipmapLevels[0].size.height,
+                                                  pSurface->faces[0].numMipLevels,
                                                   (pSurface->fUsageD3D & ~D3DUSAGE_RENDERTARGET) | D3DUSAGE_DYNAMIC /* Lockable */,
                                                   pSurface->formatD3D,
@@ -2101,7 +2101,7 @@
             Log(("Format not accepted -> try old method\n"));
             /* The format was probably not accepted; fall back to our old mode. */
-            hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width, 
-                                                  pSurface->pMipmapLevels[0].size.height, 
-                                                  pSurface->faces[0].numMipLevels, 
+            hr = pContext->pDevice->CreateTexture(pSurface->pMipmapLevels[0].size.width,
+                                                  pSurface->pMipmapLevels[0].size.height,
+                                                  pSurface->faces[0].numMipLevels,
                                                   (pSurface->fUsageD3D & ~D3DUSAGE_RENDERTARGET) |  D3DUSAGE_DYNAMIC /* Lockable */,
                                                   pSurface->formatD3D,
@@ -2360,8 +2360,8 @@
             cbSrcPitch = (guest.pitch == 0) ? pBoxes[i].w * pSurface->cbBlock : guest.pitch;
 
-            rc = vmsvgaGMRTransfer(pThis, 
+            rc = vmsvgaGMRTransfer(pThis,
                                     transfer,
-                                    (uint8_t *)pMipLevel->pSurfaceData + uDestOffset, 
-                                    pMipLevel->cbSurfacePitch, 
+                                    (uint8_t *)pMipLevel->pSurfaceData + uDestOffset,
+                                    pMipLevel->cbSurfacePitch,
                                     guest.ptr,
                                     pBoxes[i].srcx * pSurface->cbBlock + (pBoxes[i].srcy + pBoxes[i].srcz * pBoxes[i].h) * cbSrcPitch,
@@ -2495,9 +2495,9 @@
                 else
                     Log(("Lock %s memory for rectangle (%d,%d)(%d,%d)\n", (pSurface->flags & SVGA3D_SURFACE_HINT_DEPTHSTENCIL) ? "DEPTH-STENCIL" : "RENDERTARGET", Rect.left, Rect.top, Rect.right, Rect.bottom));
-                
-                rc = vmsvgaGMRTransfer(pThis, 
+
+                rc = vmsvgaGMRTransfer(pThis,
                                        transfer,
-                                       (uint8_t *)LockedRect.pBits, 
-                                       LockedRect.Pitch, 
+                                       (uint8_t *)LockedRect.pBits,
+                                       LockedRect.Pitch,
                                        guest.ptr,
                                        pBoxes[i].srcx * pSurface->cbBlock + pBoxes[i].srcy * cbSrcPitch,
@@ -2562,5 +2562,5 @@
                 if (fVertex)
                     hr = pSurface->u.pVertexBuffer->Lock(0, 0, (void **)&pData, dwFlags);
-                else        
+                else
                     hr = pSurface->u.pIndexBuffer->Lock(0, 0, (void **)&pData, dwFlags);
                 AssertMsg(hr == D3D_OK, ("vmsvga3dSurfaceDMA: Lock %s failed with %x\n", (fVertex) ? "vertex" : "index", hr));
@@ -2568,8 +2568,8 @@
                 Log(("Lock %s memory for rectangle (%d,%d)(%d,%d)\n", (fVertex) ? "vertex" : "index", pBoxes[i].x, pBoxes[i].y, pBoxes[i].x + pBoxes[i].w, pBoxes[i].y + pBoxes[i].h));
 
-                rc = vmsvgaGMRTransfer(pThis, 
+                rc = vmsvgaGMRTransfer(pThis,
                                        transfer,
-                                       pData + uDestOffset, 
-                                       pSurface->pMipmapLevels[host.mipmap].cbSurfacePitch, 
+                                       pData + uDestOffset,
+                                       pSurface->pMipmapLevels[host.mipmap].cbSurfacePitch,
                                        guest.ptr,
                                        pBoxes[i].srcx * pSurface->cbBlock + pBoxes[i].srcy * cbSrcPitch,
@@ -2618,5 +2618,5 @@
         SVGA3dCopyBox        box;
         SVGA3dGuestImage     dest;
-       
+
         box.x       = destRect.left;
         box.y       = destRect.top;
@@ -2654,5 +2654,5 @@
         /* @todo merge into one SurfaceDMA call */
         for (uint32_t i = 0; i < cRects; i++)
-        {   
+        {
             /* The clipping rectangle is relative to the top-left corner of srcRect & destRect. Adjust here. */
             box.srcx = srcRect.left + pRect[i].left;
@@ -2776,5 +2776,5 @@
     IDirect3DSurface9  *pBackBuffer;
     IDirect3DSurface9  *pSurfaceD3D;
-    struct 
+    struct
     {
         uint32_t        x;
@@ -2813,5 +2813,5 @@
     {
         hr = pSurface->u.pTexture->GetSurfaceLevel(0, &pSurfaceD3D);
-        AssertMsgReturn(hr == D3D_OK, ("vmsvga3dCommandPresent: GetSurfaceLevel failed with %x\n", hr), VERR_INTERNAL_ERROR);        
+        AssertMsgReturn(hr == D3D_OK, ("vmsvga3dCommandPresent: GetSurfaceLevel failed with %x\n", hr), VERR_INTERNAL_ERROR);
     }
     else
@@ -3293,5 +3293,5 @@
             }
 #endif /* #ifdef VMSVGA3D_DIRECT3D9_RESET */
-            memset(&cs, 0, sizeof(cs));            
+            memset(&cs, 0, sizeof(cs));
             cs.cx = pThis->svga.uWidth;
             cs.cy = pThis->svga.uHeight;
@@ -3597,5 +3597,5 @@
         switch (pRenderState[i].state)
         {
-        case SVGA3D_RS_ZENABLE:                /* SVGA3dBool */            
+        case SVGA3D_RS_ZENABLE:                /* SVGA3dBool */
             renderState = D3DRS_ZENABLE;
             val = pRenderState[i].uintValue;
@@ -4295,11 +4295,11 @@
                  */
                 IDirect3DSurface9* pDummyRenderTarget;
-                hr = pContext->pDevice->CreateRenderTarget(pThis->svga.uWidth, 
-                                                           pThis->svga.uHeight, 
+                hr = pContext->pDevice->CreateRenderTarget(pThis->svga.uWidth,
+                                                           pThis->svga.uHeight,
                                                            FOURCC_NULL,
-                                                           D3DMULTISAMPLE_NONE, 
-                                                           0, 
-                                                           FALSE, 
-                                                           &pDummyRenderTarget, 
+                                                           D3DMULTISAMPLE_NONE,
+                                                           0,
+                                                           FALSE,
+                                                           &pDummyRenderTarget,
                                                            NULL);
 
@@ -4354,9 +4354,9 @@
                 AssertRC(rc);   /* non-fatal */
             }
-            
+
             if (!pRenderTarget->fStencilAsTexture)
             {
                 Log(("vmsvga3dSetRenderTarget DEPTH/STENCIL; cQualityLevels=%d\n", cQualityLevels));
-                hr = pContext->pDevice->CreateDepthStencilSurface(pRenderTarget->pMipmapLevels[0].size.width, 
+                hr = pContext->pDevice->CreateDepthStencilSurface(pRenderTarget->pMipmapLevels[0].size.width,
                                                                   pRenderTarget->pMipmapLevels[0].size.height,
                                                                   pRenderTarget->formatD3D,
@@ -4507,6 +4507,6 @@
                 Log(("Create rendertarget (%d,%d) format=%x multisample=%x\n", pRenderTarget->pMipmapLevels[0].size.width, pRenderTarget->pMipmapLevels[0].size.height, pRenderTarget->formatD3D, pRenderTarget->multiSampleTypeD3D));
 
-                hr = pContext->pDevice->CreateRenderTarget(pRenderTarget->pMipmapLevels[0].size.width, 
-                                                           pRenderTarget->pMipmapLevels[0].size.height, 
+                hr = pContext->pDevice->CreateRenderTarget(pRenderTarget->pMipmapLevels[0].size.width,
+                                                           pRenderTarget->pMipmapLevels[0].size.height,
                                                            pRenderTarget->formatD3D,
                                                            pRenderTarget->multiSampleTypeD3D,
@@ -4820,5 +4820,5 @@
                 {
                     Log(("vmsvga3dSetTextureState; using texture %x created for another context (%d vs %d)\n", sid, pSurface->idAssociatedContext, cid));
-    
+
                     PVMSVGA3DSHAREDSURFACE pSharedSurface = vmsvga3dSurfaceGetSharedCopy(pThis, pContext, pSurface);
                     AssertReturn(pSharedSurface, VERR_INTERNAL_ERROR);
@@ -4882,20 +4882,20 @@
             val = pTextureState[i].value;   /* Identical */
             break;
-            
+
         case SVGA3D_TS_TEXTURE_LOD_BIAS:            /* float */
             samplerType = D3DSAMP_MIPMAPLODBIAS;
             val = pTextureState[i].value;   /* Identical */
             break;
-            
+
         case SVGA3D_TS_TEXTURE_MIPMAP_LEVEL:        /* uint32_t */
             samplerType = D3DSAMP_MAXMIPLEVEL;
             val = pTextureState[i].value;   /* Identical?? */
             break;
-            
+
         case SVGA3D_TS_TEXTURE_ANISOTROPIC_LEVEL:   /* uint32_t */
             samplerType = D3DSAMP_MAXANISOTROPY;
             val = pTextureState[i].value;   /* Identical?? */
             break;
-            
+
         case SVGA3D_TS_GAMMA:                       /* float */
             samplerType = D3DSAMP_SRGBTEXTURE;
@@ -4905,5 +4905,5 @@
             else
                 val = TRUE;
-            break;           
+            break;
 
         /* Internal commands, that don't map directly to the SetTextureStageState API. */
@@ -5477,5 +5477,5 @@
 
             if (    sidIndex >= SVGA3D_MAX_SURFACE_IDS
-                ||  sidIndex >= pState->cSurfaces 
+                ||  sidIndex >= pState->cSurfaces
                 ||  pState->paSurface[sidIndex].id != sidIndex)
             {
@@ -5563,5 +5563,5 @@
             UINT numVertices;
 
-            if (pVertexDecl[0].rangeHint.last) 
+            if (pVertexDecl[0].rangeHint.last)
                 numVertices = pVertexDecl[0].rangeHint.last - pVertexDecl[0].rangeHint.first + 1;
             else
Index: /trunk/src/VBox/Devices/Network/DevE1000.cpp
===================================================================
--- /trunk/src/VBox/Devices/Network/DevE1000.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/DevE1000.cpp	(revision 53624)
@@ -2818,5 +2818,5 @@
         E1kLog(("%s WARNING! Access to invalid PHY detected, phy=%d.\n",
                 pThis->szPrf, GET_BITS_V(value, MDIC, PHY)));
-        /* 
+        /*
          * Some drivers scan the MDIO bus for a PHY. We can work with these
          * drivers if we set MDIC_READY and MDIC_ERROR when there isn't a PHY
Index: /trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp
===================================================================
--- /trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp	(revision 53624)
@@ -2815,5 +2815,5 @@
  */
 static void intnetR0TrunkSharedMacEditIPv6FromIntNet(PINTNETTRUNKIF pThis, PINTNETIF pIfSender,
-						     PRTNETETHERHDR pEthHdr, uint32_t cb)
+                                                     PRTNETETHERHDR pEthHdr, uint32_t cb)
 {
     if (RT_UNLIKELY(cb < sizeof(*pEthHdr)))
@@ -2842,22 +2842,22 @@
     {
         case RTNETIPV6_ICMP_TYPE_RS:
-	    hdrlen = 8;
-	    break;
+            hdrlen = 8;
+            break;
 
         case RTNETIPV6_ICMP_TYPE_RA:
-	    hdrlen = 16;
-	    break;
+            hdrlen = 16;
+            break;
 
         case RTNETIPV6_ICMP_TYPE_NS:
-	    hdrlen = 24;
-	    break;
+            hdrlen = 24;
+            break;
 
         case RTNETIPV6_ICMP_TYPE_NA:
-	    hdrlen = 24;
-	    llaopt = RTNETIPV6_ICMP_ND_TLLA_OPT;
-	    break;
+            hdrlen = 24;
+            llaopt = RTNETIPV6_ICMP_ND_TLLA_OPT;
+            break;
 
         default:
-	    return;
+            return;
     }
 
@@ -2867,5 +2867,5 @@
 
     if (RT_UNLIKELY(pICMPv6->icmp6_code != 0))
-	return;
+        return;
 
     PRTNETNDP_LLA_OPT pLLAOpt = NULL;
@@ -2882,6 +2882,6 @@
         if (opt == llaopt)
         {
-	    if (RT_UNLIKELY(optlen != 8))
-		return;
+            if (RT_UNLIKELY(optlen != 8))
+                return;
             pLLAOpt = (PRTNETNDP_LLA_OPT)pOpt;
             break;
Index: /trunk/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp	(revision 53624)
@@ -20,7 +20,7 @@
  * we want that every NAT and DevINIP instance uses a initialized LWIP
  * initialization of LWIP should happen on iLWIPInitiatorCounter 0 -> 1.
- * see pfnConstruct/Destruct. 
+ * see pfnConstruct/Destruct.
  *
- * @note: see comment to DevINIP.cpp:DevINIPConfigured 
+ * @note: see comment to DevINIP.cpp:DevINIPConfigured
  * @note: perhaps initilization stuff would be better move out of NAT driver,
  *  because we have to deal with attaching detaching NAT driver at runtime.
@@ -49,10 +49,10 @@
     PFNRT1 pfn;
     void *pvUser;
-} LWIPCOREUSERCALLBACK, *PLWIPCOREUSERCALLBACK; 
+} LWIPCOREUSERCALLBACK, *PLWIPCOREUSERCALLBACK;
 
 
 RTCLockMtx g_mtxLwip;
 
-typedef struct LWIPCORE 
+typedef struct LWIPCORE
 {
     int iLWIPInitiatorCounter;
@@ -164,5 +164,5 @@
 
 /**
- * This function decrement lwip reference counter 
+ * This function decrement lwip reference counter
  * and calls tcpip thread termination function.
  */
Index: /trunk/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.h
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.h	(revision 53624)
@@ -23,5 +23,5 @@
 typedef FNRT1 *PFNRT1;
 /**
- * initiliazes LWIP core, and do callback on tcp/ip thread 
+ * initiliazes LWIP core, and do callback on tcp/ip thread
  */
 int vboxLwipCoreInitialize(PFNRT1 pfnCallback, void * pfnCallbackArg);
Index: /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/arch/cc.h
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/arch/cc.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/arch/cc.h	(revision 53624)
@@ -34,5 +34,5 @@
 # define PACK_STRUCT_USE_INCLUDES
 # if _MSC_VER < 1600
-#  define LWIP_PROVIDE_ERRNO 
+#  define LWIP_PROVIDE_ERRNO
 # else
 #  include <errno.h>
Index: /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-namespace.h
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-namespace.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-namespace.h	(revision 53624)
@@ -188,5 +188,5 @@
 #define tcp_rexmit lwip_tcp_rexmit
 #define tcp_rexmit_rto lwip_tcp_rexmit_rto
-/* tcp_rst is renaming to tcp_rst_impl, 
+/* tcp_rst is renaming to tcp_rst_impl,
  * so for cleaner ABI, _impl was added. */
 #define tcp_rst_impl lwip_tcp_rst_impl
Index: /trunk/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c	(revision 53624)
@@ -403,5 +403,5 @@
         rc = LWIPMutexRelease((mbox)->mutex);
         AssertRC(rc);
-	return SYS_MBOX_EMPTY;
+        return SYS_MBOX_EMPTY;
     }
     if (((mbox)->head + 1) % MBOX_ENTRIES_MAX == (mbox)->tail)
Index: /trunk/src/VBox/Devices/Network/lwipopts.h
===================================================================
--- /trunk/src/VBox/Devices/Network/lwipopts.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/lwipopts.h	(revision 53624)
@@ -101,5 +101,5 @@
 /* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool.
    Use default that is based on TCP_MSS and PBUF_LINK_HLEN.  */
-#undef PBUF_POOL_BUFSIZE  
+#undef PBUF_POOL_BUFSIZE
 
 /** Turn on support for lightweight critical region protection. Leaving this
@@ -129,8 +129,8 @@
 #define LWIP_ND6_ALLOW_RA_UPDATES       (!LWIP_IPV6_FORWARD)
 #define LWIP_IPV6_SEND_ROUTER_SOLICIT   (!LWIP_IPV6_FORWARD)
-/* IPv6 autoconfig we don't need in proxy, but it required for very seldom cases 
+/* IPv6 autoconfig we don't need in proxy, but it required for very seldom cases
  * iSCSI over intnet with IPv6
  */
-#define LWIP_IPV6_AUTOCONFIG            1 
+#define LWIP_IPV6_AUTOCONFIG            1
 #if LWIP_IPV6_FORWARD /* otherwise use the default from lwip/opt.h */
 #define LWIP_IPV6_DUP_DETECT_ATTEMPTS   0
@@ -139,5 +139,5 @@
 #define LWIP_IPV6_FRAG                  1
 
-/** 
+/**
  * aka Slirp mode.
  */
Index: /trunk/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py
===================================================================
--- /trunk/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py	(revision 53624)
@@ -23,10 +23,10 @@
 #        "VBoxInternal/Devices/pcnet/0/LUN#0/Config/www/GuestPort" 80
 # > VBoxManage setextradata "winXP"
-#        "VBoxInternal/Devices/pcnet/0/LUN#0/Config/www/HostPort" 8080 
+#        "VBoxInternal/Devices/pcnet/0/LUN#0/Config/www/HostPort" 8080
 ################################################################################
 
 import os,sys
 from vboxapi import VirtualBoxManager
-import optparse 
+import optparse
 
 class OptionParser (optparse.OptionParser):
@@ -41,5 +41,5 @@
 def generate_profile_name(proto, host_port, guest_port):
     return proto + '_' + str(host_port) + '_' + str(guest_port)
- 
+
 def main(argv):
 
@@ -59,5 +59,5 @@
                      default=-1)
     (options,args) = parser.parse_args(argv)
-    
+
     if (not (parser.check_required("-V") or parser.check_required("-G"))):
         parser.error("please define --vm or --guid option")
@@ -84,5 +84,5 @@
     except:
         print "can't find VM by name or UID:",options.vmname
-        del man 
+        del man
         return
 
@@ -93,7 +93,7 @@
 
     adapter = vm.getNetworkAdapter(options.adapter)
-    
+
     if adapter.enabled == False:
-        print "adapter(%d) is disabled" % adapter.slot    
+        print "adapter(%d) is disabled" % adapter.slot
         del man
         return
@@ -102,5 +102,5 @@
     if (adapter.adapterType == man.constants.NetworkAdapterType_Null):
         print "none adapter type detected"
-        return -1 
+        return -1
     elif (adapter.adapterType == man.constants.NetworkAdapterType_Am79C970A):
         name = "pcnet"
@@ -114,13 +114,13 @@
         name = "e1000"
     print "adapter of '%s' type has been detected" % name
-    
+
     profile_name = options.profile
     if profile_name == None:
-        profile_name = generate_profile_name(options.proto.upper(), 
-                                            options.host_port, 
+        profile_name = generate_profile_name(options.proto.upper(),
+                                            options.host_port,
                                             options.guest_port)
     config = "VBoxInternal/Devices/" + name + "/"
     config = config + str(adapter.slot)  +"/LUN#0/Config/" + profile_name
-    proto = config + "/Protocol" 
+    proto = config + "/Protocol"
     host_port = config + "/HostPort"
     guest_port = config + "/GuestPort"
Index: /trunk/src/VBox/Devices/Network/slirp/bootp.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/bootp.c	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/bootp.c	(revision 53624)
@@ -706,11 +706,11 @@
      * within transaction), assuming that transaction can't be longer than 1 min.
      *
-     * @note: if we have notification update (HAVE_NOTIFICATION_FOR_DNS_UPDATE) 
-     * provided by host, we don't need implicitly re-initialize dns list. 
-     * 
-     * @note: NATState::fUseHostResolver became (r89055) the flag signalling that Slirp 
-     * wasn't able to fetch fresh host DNS info and fall down to use host-resolver, on one 
+     * @note: if we have notification update (HAVE_NOTIFICATION_FOR_DNS_UPDATE)
+     * provided by host, we don't need implicitly re-initialize dns list.
+     *
+     * @note: NATState::fUseHostResolver became (r89055) the flag signalling that Slirp
+     * wasn't able to fetch fresh host DNS info and fall down to use host-resolver, on one
      * of the previous attempts to proxy dns requests to Host's name-resolving API
-     * 
+     *
      * @note: Checking NATState::fUseHostResolver == true, we want to try restore behaviour initialy
      * wanted by user ASAP (P here when host serialize its  configuration in files parsed by Slirp).
Index: /trunk/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.h
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.h	(revision 53624)
@@ -88,5 +88,5 @@
      */
     struct dns_entry    *dns_server;
-    uint32_t            dnsgen; 
+    uint32_t            dnsgen;
     int nbyte; /* length of dns request */
     char byte[1]; /* copy of original request */
Index: /trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c	(revision 53624)
@@ -114,5 +114,5 @@
         RTMemFree(pong);
     }
- 
+
     /* this should be empty */
     while (!TAILQ_EMPTY(&pData->pongs_expected)) {
Index: /trunk/src/VBox/Devices/Network/slirp/libslirp.h
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/libslirp.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/libslirp.h	(revision 53624)
@@ -116,5 +116,5 @@
  * - ignore (NAT configured to use hostresolver - we aren't track any host DNS changes)
  *    VBOX_NAT_DNS_HOSTRESOLVER
- * @note: It's safe to call this method from any thread, because settings we're checking 
+ * @note: It's safe to call this method from any thread, because settings we're checking
  * are immutable at runtime.
  */
Index: /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.c	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.c	(revision 53624)
@@ -404,5 +404,5 @@
     if (st->rcps_num_searchlist >= RCPS_MAX_SEARCHLIST)
         return rcp_get_token(parser);
-    
+
     /* we don't want accept keywords */
     if (tok <= tok_nameserver)
Index: /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.h
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.h	(revision 53624)
@@ -41,6 +41,6 @@
 
 /**
- * In Slirp we don't need IPv6 for general case (only for dnsproxy mode 
- * it's potentially acceptable) 
+ * In Slirp we don't need IPv6 for general case (only for dnsproxy mode
+ * it's potentially acceptable)
  */
 #define RCPSF_IGNORE_IPV6 RT_BIT(0)
Index: /trunk/src/VBox/Devices/Network/slirp/slirp.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/slirp.c	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/slirp.c	(revision 53624)
@@ -64,8 +64,8 @@
 
 #ifndef RT_OS_WINDOWS
-/** 
+/**
  * XXX: It shouldn't be non-Windows specific.
  * resolv_conf_parser.h client's structure isn't OS specific, it's just need to be generalized a
- * a bit to replace slirp_state.h DNS server (domain) lists with rcp_state like structure.  
+ * a bit to replace slirp_state.h DNS server (domain) lists with rcp_state like structure.
  */
 # include "resolv_conf_parser.h"
@@ -466,5 +466,5 @@
 {
     struct arp_cache_entry *ac;
-    
+
     if (link_up == 1)
         return;
@@ -496,5 +496,5 @@
 
     slirpReleaseDnsSettings(pData);
-    
+
     while ((so = tcb.so_next) != &tcb)
     {
@@ -2120,5 +2120,5 @@
         struct rcp_state rcp_state;
         int rc;
-        
+
         rcp_state.rcps_flags |= RCPSF_IGNORE_IPV6;
         rc = rcp_parse(&rcp_state, RESOLV_CONF_FILE);
@@ -2129,5 +2129,5 @@
             || LIST_EMPTY(&pData->pDomainList))
             return VBOX_NAT_DNS_DNSPROXY;
-        
+
         if (   rcp_state.rcps_domain
             && strcmp(rcp_state.rcps_domain, LIST_FIRST(&pData->pDomainList)->dd_pszDomain) == 0)
Index: /trunk/src/VBox/Devices/Network/slirp/slirp_dns.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/slirp_dns.c	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/slirp_dns.c	(revision 53624)
@@ -175,8 +175,8 @@
         return -1;
 
-    
-    /* XXX: We're composing the list, but we already knows 
-     * its size so we can allocate array instead (Linux guests 
-     * dont like >3 servers in the list anyway) 
+
+    /* XXX: We're composing the list, but we already knows
+     * its size so we can allocate array instead (Linux guests
+     * dont like >3 servers in the list anyway)
      * or use pre-allocated array in NATState.
      */
@@ -185,10 +185,10 @@
         struct dns_entry *pDns;
         RTNETADDRU *address = &st.rcps_nameserver[i].uAddr;
-        if (  (address->IPv4.u & RT_H2N_U32_C(IN_CLASSA_NET)) 
-           == RT_N2H_U32_C(INADDR_LOOPBACK & IN_CLASSA_NET)) 
-        {
-            /** 
+        if (  (address->IPv4.u & RT_H2N_U32_C(IN_CLASSA_NET))
+           == RT_N2H_U32_C(INADDR_LOOPBACK & IN_CLASSA_NET))
+        {
+            /**
              * XXX: Note shouldn't patch the address in case of using DNS proxy,
-             * because DNS proxy we do revert it back actually. 
+             * because DNS proxy we do revert it back actually.
              */
             if (address->IPv4.u == RT_N2H_U32_C(INADDR_LOOPBACK))
Index: /trunk/src/VBox/Devices/Network/slirp/slirp_state.h
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/slirp_state.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/slirp_state.h	(revision 53624)
@@ -253,6 +253,6 @@
     /**
      * in (r89055) using of this behaviour has been changed and mean that Slirp
-     * can't parse hosts strucutures/files to provide to guest host name-resolving 
-     * configuration, instead Slirp provides .{interface-number + 1}.3 as a nameserver 
+     * can't parse hosts strucutures/files to provide to guest host name-resolving
+     * configuration, instead Slirp provides .{interface-number + 1}.3 as a nameserver
      * and proxies DNS queiries to Host's Name Resolver API.
      */
@@ -260,5 +260,5 @@
     /**
      * Flag whether using the host resolver mode is permanent
-     * because the user configured it that way. 
+     * because the user configured it that way.
      */
     bool fUseHostResolverPermanent;
Index: /trunk/src/VBox/Devices/Network/slirp/socket.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/socket.c	(revision 53623)
+++ /trunk/src/VBox/Devices/Network/slirp/socket.c	(revision 53624)
@@ -810,5 +810,5 @@
 {
     LogFlowFunc(("sorecvfrom: so = %lx\n", (long)so));
- 
+
 #ifdef RT_OS_WINDOWS
     /* ping is handled with ICMP API in ip_icmpwin.c */
Index: /trunk/src/VBox/Devices/PC/BIOS/floppy.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/floppy.c	(revision 53623)
+++ /trunk/src/VBox/Devices/PC/BIOS/floppy.c	(revision 53624)
@@ -583,5 +583,5 @@
             outb(0x0005, base_count);
             outb(0x0005, base_count>>8);
-            BX_DEBUG_INT13_FL("xfer buf %x bytes at %x:%x\n", 
+            BX_DEBUG_INT13_FL("xfer buf %x bytes at %x:%x\n",
                               base_count, page, base_address);
 
@@ -722,5 +722,5 @@
             outb(0x0005, base_count);
             outb(0x0005, base_count>>8);
-            BX_DEBUG_INT13_FL("xfer buf %x bytes at %x:%x\n", 
+            BX_DEBUG_INT13_FL("xfer buf %x bytes at %x:%x\n",
                               base_count, page, base_address);
 
Index: /trunk/src/VBox/Devices/Storage/DrvBlock.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DrvBlock.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/Storage/DrvBlock.cpp	(revision 53624)
@@ -151,5 +151,5 @@
 static DECLCALLBACK(int) drvblockReadPcBios(PPDMIBLOCK pInterface, uint64_t off, void *pvBuf, size_t cbRead)
 {
-    PDRVBLOCK pThis = PDMIBLOCK_2_DRVBLOCK(pInterface); 
+    PDRVBLOCK pThis = PDMIBLOCK_2_DRVBLOCK(pInterface);
 
     /*
Index: /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h
===================================================================
--- /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h	(revision 53623)
+++ /trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h	(revision 53624)
@@ -265,5 +265,5 @@
  * @param   uSCSISenseKey The SCSI sense key to set.
  * @param   uSCSIASC      The ASC value.
- * @param   uSCSIASC      The ASCQ value. 
+ * @param   uSCSIASC      The ASCQ value.
  * @param   uInfo         The 32-bit sense information.
  */
Index: /trunk/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp
===================================================================
--- /trunk/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp	(revision 53624)
@@ -584,5 +584,5 @@
         if (RT_FAILURE(rc))
             LogRel(("UsbIp: Disabling send coalescing failed (rc=%Rrc), continuing nevertheless but expect reduced performance\n", rc));
- 
+
         /* Import the device, i.e. claim it for our use. */
         UsbIpReqImport ReqImport;
@@ -1007,5 +1007,5 @@
     if (pUrbUsbIp)
     {
-        
+
     }
 
Index: /trunk/src/VBox/Devices/build/VBoxDD.cpp
===================================================================
--- /trunk/src/VBox/Devices/build/VBoxDD.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/build/VBoxDD.cpp	(revision 53624)
@@ -294,8 +294,8 @@
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostALSAAudio);
     if (RT_FAILURE(rc))
-        return rc;    
+        return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
     if (RT_FAILURE(rc))
-        return rc;    
+        return rc;
 # endif
 # if defined(RT_OS_FREEBSD)
@@ -312,5 +312,5 @@
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
     if (RT_FAILURE(rc))
-        return rc;   
+        return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostSolAudio);
     if (RT_FAILURE(rc))
Index: /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
===================================================================
--- /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp	(revision 53623)
+++ /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp	(revision 53624)
@@ -1865,5 +1865,5 @@
     GEN_CHECK_OFF(HDASTATE, pSinkLineIn);
     GEN_CHECK_OFF(HDASTATE, pSinkMicIn);
-#else 
+#else
     GEN_CHECK_OFF(HDASTATE, pCodec);
     GEN_CHECK_OFF(HDASTATE, u64BaseTS);
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp	(revision 53623)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp	(revision 53624)
@@ -285,6 +285,6 @@
         /* we have to open a session for this task (new or shared) */
         rc = pMachine->LockMachine(a->session, LockType_Shared);
-	ComPtr<IConsole> pConsole;
-	CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(pConsole.asOutParam()));
+        ComPtr<IConsole> pConsole;
+        CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(pConsole.asOutParam()));
 
         /* switch based on the command */
Index: /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp	(revision 53623)
+++ /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp	(revision 53624)
@@ -1491,5 +1491,5 @@
     if (fSeparate)
     {
-        MachineState_T machineState = MachineState_Null; 
+        MachineState_T machineState = MachineState_Null;
         pMachine->COMGETTER(State)(&machineState);
         if (   machineState == MachineState_Running
Index: /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py
===================================================================
--- /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py	(revision 53623)
+++ /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py	(revision 53624)
@@ -315,5 +315,5 @@
     (status, _timestamp) = guest.getFacilityStatus(facilityType)
     return asEnumElem(ctx, 'AdditionsFacilityStatus', status)
-        
+
 def perfStats(ctx, mach):
     if not ctx['perf']:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/WinKeyboard.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/WinKeyboard.cpp	(revision 53623)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/platform/win/WinKeyboard.cpp	(revision 53624)
@@ -17,5 +17,5 @@
 
 #define LOG_GROUP LOG_GROUP_GUI
- 
+
 #include "WinKeyboard.h"
 #include <iprt/assert.h>
@@ -181,5 +181,5 @@
   * no AltGr key in the layout then it will run right through, but that should
   * hopefully not happen very often.
-  * 
+  *
   * In theory we could do this once and cache the result, but that involves
   * tracking layout switches to invalidate the cache, and I don't think that the
@@ -272,7 +272,7 @@
         return false;
 
-	if (messageTime != peekMsg.time)
-	    return false;
-	if (   fKeyDown
+        if (messageTime != peekMsg.time)
+            return false;
+        if (   fKeyDown
         && (peekMsg.message != WM_KEYDOWN && peekMsg.message != WM_SYSKEYDOWN))
         return false;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp	(revision 53623)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp	(revision 53624)
@@ -75,5 +75,5 @@
 # include "WinKeyboard.h"
 #endif /* Q_WS_WIN */
- 
+
 /* Enums representing different keyboard-states: */
 enum { KeyExtended = 0x01, KeyPressed = 0x02, KeyPause = 0x04, KeyPrint = 0x08 };
@@ -183,5 +183,5 @@
     NOREF(pDisplay);
     struct CHECKFORX11FOCUSEVENTSDATA *pStruct;
-    
+
     pStruct = (struct CHECKFORX11FOCUSEVENTSDATA *)pArg;
     if (   pEvent->xany.type == XFocusIn
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	(revision 53623)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	(revision 53624)
@@ -1982,5 +1982,5 @@
     {
 #if defined(Q_WS_MAC)
-    	DarwinHidDevicesApplyAndReleaseLedsState(m_pHostLedsState);
+        DarwinHidDevicesApplyAndReleaseLedsState(m_pHostLedsState);
 #elif defined(Q_WS_WIN)
         keyboardHandler()->winSkipKeyboardEvents(true);
Index: /trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp	(revision 53623)
+++ /trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp	(revision 53624)
@@ -798,3 +798,2 @@
 }
 
-
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	(revision 53623)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	(revision 53624)
@@ -153,5 +153,5 @@
   VBoxNetLwf_DEBUG_INSTTYPE = both
  endif
- VBoxNetLwf_DEFS = IN_RT_R0 IN_SUP_STATIC 
+ VBoxNetLwf_DEFS = IN_RT_R0 IN_SUP_STATIC
  VBoxNetLwf_INCS = .
  VBoxNetLwf_SOURCES = VBoxNetFlt.c
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.cpp	(revision 53623)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.cpp	(revision 53624)
@@ -174,5 +174,5 @@
 
     LogFlow(("==>"__FUNCTION__": adapter handle=%p\n", hAdapter));
-    
+
     *ppAdapter = NULL;
 
@@ -240,5 +240,5 @@
             break;
         }
-    
+
         RAttrs.Header.Type = NDIS_OBJECT_TYPE_MINIPORT_ADAPTER_REGISTRATION_ATTRIBUTES;
         RAttrs.Header.Size = NDIS_SIZEOF_MINIPORT_ADAPTER_REGISTRATION_ATTRIBUTES_REVISION_1;
@@ -369,5 +369,5 @@
             if (cbInfo > pQuery->InformationBufferLength)
                 break;
-            pParams->Header.Type = NDIS_OBJECT_TYPE_DEFAULT; 
+            pParams->Header.Type = NDIS_OBJECT_TYPE_DEFAULT;
             pParams->Header.Revision = NDIS_INTERRUPT_MODERATION_PARAMETERS_REVISION_1;
             pParams->Header.Size = NDIS_SIZEOF_INTERRUPT_MODERATION_PARAMETERS_REVISION_1;
@@ -402,5 +402,5 @@
             pInfo = NULL; /* Do not copy */
             memset(pStats, 0, cbInfo);
-            pStats->Header.Type = NDIS_OBJECT_TYPE_DEFAULT; 
+            pStats->Header.Type = NDIS_OBJECT_TYPE_DEFAULT;
             pStats->Header.Revision = NDIS_STATISTICS_INFO_REVISION_1;
             pStats->Header.Size = NDIS_SIZEOF_STATISTICS_INFO_REVISION_1;
@@ -508,5 +508,5 @@
             Status = NDIS_STATUS_SUCCESS;
             break;
-            
+
         default:
             Status = NDIS_STATUS_NOT_SUPPORTED;
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp	(revision 53623)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp	(revision 53624)
@@ -579,5 +579,5 @@
         Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(pModuleCtx->uPacketFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
     }
-    
+
     Log5((__FUNCTION__": OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
     vboxNetLwfWinDumpFilterTypes(pModuleCtx->uPacketFilter);
@@ -817,5 +817,5 @@
     }
     pModuleCtx->pNetFlt = NULL;
-        
+
     /*
      * We have to make sure that all NET_BUFFER_LIST structures have been freed by now, but
@@ -1404,5 +1404,5 @@
         NdisFSendNetBufferListsComplete(pModule->hFilter, pBufLists,
                                         fFlags & NDIS_SEND_FLAGS_DISPATCH_LEVEL ? NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL : 0);
-        
+
     }
     LogFlow(("<=="__FUNCTION__"\n"));
Index: /trunk/src/VBox/HostServices/SharedClipboard/service.cpp
===================================================================
--- /trunk/src/VBox/HostServices/SharedClipboard/service.cpp	(revision 53623)
+++ /trunk/src/VBox/HostServices/SharedClipboard/service.cpp	(revision 53624)
@@ -765,5 +765,5 @@
 {
 #ifndef UNIT_TEST
-    /* 
+    /*
      * When the state will be restored, pending requests will be reissued
      * by VMMDev. The service therefore must save state as if there were no
Index: /trunk/src/VBox/Installer/linux/install_service/init_template.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/install_service/init_template.sh	(revision 53623)
+++ /trunk/src/VBox/Installer/linux/install_service/init_template.sh	(revision 53624)
@@ -30,5 +30,5 @@
 cr="
 "
-tab="	"
+tab="   "
 IFS=" ${cr}${tab}"
 'unset' -f unalias
Index: /trunk/src/VBox/Installer/linux/install_service/install_service.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/install_service/install_service.sh	(revision 53623)
+++ /trunk/src/VBox/Installer/linux/install_service/install_service.sh	(revision 53624)
@@ -18,5 +18,5 @@
 cr="
 "
-tab="	"
+tab="   "
 IFS=" ${cr}${tab}"
 'unset' -f unalias
Index: /trunk/src/VBox/Installer/linux/testcase/tstInstallInit.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/testcase/tstInstallInit.sh	(revision 53623)
+++ /trunk/src/VBox/Installer/linux/testcase/tstInstallInit.sh	(revision 53624)
@@ -20,5 +20,5 @@
 # debugging when you suspect that something isn't working as specified.
 
-tab="	"
+tab="   "
 tmpbase="/tmp/tstInstallInit 99"  # Space in the name for a little stress...
 if [ -n "${TESTBOX_PATH_SCRATCH}" ]; then
Index: /trunk/src/VBox/Main/Config.kmk
===================================================================
--- /trunk/src/VBox/Main/Config.kmk	(revision 53623)
+++ /trunk/src/VBox/Main/Config.kmk	(revision 53624)
@@ -40,3 +40,2 @@
 VBOX_AUTOGEN_EVENT_CPP  = $(PATH_TARGET)/Main/VBoxEvents.cpp
 
-
Index: /trunk/src/VBox/Main/include/QMTranslator.h
===================================================================
--- /trunk/src/VBox/Main/include/QMTranslator.h	(revision 53623)
+++ /trunk/src/VBox/Main/include/QMTranslator.h	(revision 53624)
@@ -29,9 +29,9 @@
     /* Gets translation from loaded QM file
      *
-     * @param	context	  QM context to look for translation
+     * @param   context   QM context to look for translation
      * @param   source    Source string in one-byte encoding
      * @param   disamb    Disambiguationg comment, empty by default
      *
-     * @returns	Pointer to a translation in UTF-8 encoding, empty string on failure */
+     * @returns Pointer to a translation in UTF-8 encoding, empty string on failure */
 
     const char *translate(const char *pszContext, const char *pszSource, const char *pszDisamb = "") const throw();
@@ -45,6 +45,6 @@
 
 private:
-	/* QMTranslator implementation.
-	 * To separate all the code from the interface */
+        /* QMTranslator implementation.
+         * To separate all the code from the interface */
     QMTranslator_Impl *_impl;
 
Index: /trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp	(revision 53623)
+++ /trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp	(revision 53624)
@@ -107,5 +107,5 @@
     {
         unconst(mData.portVersion)  = mData.version;
-        unconst(mData.speed) = mData.version == 3 
+        unconst(mData.speed) = mData.version == 3
                              ? (USBConnectionSpeed_T)USBConnectionSpeed_Super
                              : mData.version == 2 ? (USBConnectionSpeed_T)USBConnectionSpeed_High
Index: /trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp	(revision 53623)
+++ /trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp	(revision 53624)
@@ -82,5 +82,5 @@
 {
     struct rcp_state st;
-    
+
     st.rcps_flags = RCPSF_NO_STR2IPCONV;
     int rc = rcp_parse(&st, m->resolvConfFilename.c_str());
@@ -94,5 +94,5 @@
         info.servers.push_back(st.rcps_str_nameserver[i]);
     }
-    
+
     if (st.rcps_domain)
         info.domain = st.rcps_domain;
Index: /trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp	(revision 53623)
+++ /trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp	(revision 53624)
@@ -271,5 +271,5 @@
                             DNS_CONFIG_FLAG_ALLOC, NULL, NULL,
                             &pIp4Array, &cbBuffer);
-    
+
     if (status == NO_ERROR && pIp4Array != NULL)
     {
Index: /trunk/src/VBox/Main/webservice/samples/python/clienttest.py
===================================================================
--- /trunk/src/VBox/Main/webservice/samples/python/clienttest.py	(revision 53623)
+++ /trunk/src/VBox/Main/webservice/samples/python/clienttest.py	(revision 53624)
@@ -18,5 +18,5 @@
 #   to point to your VirtualBox installation directory (which in turn must have
 #   the "sdk" subfolder")
-# - Install the VirtualBox Python bindings by doing a 
+# - Install the VirtualBox Python bindings by doing a
 #   "[python] vboxapisetup.py install"
 # - Run this sample with "[python] clienttest.py"
Index: /trunk/src/VBox/NetworkServices/NAT/lwipopts.h
===================================================================
--- /trunk/src/VBox/NetworkServices/NAT/lwipopts.h	(revision 53623)
+++ /trunk/src/VBox/NetworkServices/NAT/lwipopts.h	(revision 53624)
@@ -104,5 +104,5 @@
 /* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool.
    Use default that is based on TCP_MSS and PBUF_LINK_HLEN.  */
-#undef PBUF_POOL_BUFSIZE  
+#undef PBUF_POOL_BUFSIZE
 
 /** Turn on support for lightweight critical region protection. Leaving this
@@ -132,8 +132,8 @@
 #define LWIP_ND6_ALLOW_RA_UPDATES       (!LWIP_IPV6_FORWARD)
 #define LWIP_IPV6_SEND_ROUTER_SOLICIT   (!LWIP_IPV6_FORWARD)
-/* IPv6 autoconfig we don't need in proxy, but it required for very seldom cases 
+/* IPv6 autoconfig we don't need in proxy, but it required for very seldom cases
  * iSCSI over intnet with IPv6
  */
-#define LWIP_IPV6_AUTOCONFIG            1 
+#define LWIP_IPV6_AUTOCONFIG            1
 #if LWIP_IPV6_FORWARD /* otherwise use the default from lwip/opt.h */
 #define LWIP_IPV6_DUP_DETECT_ATTEMPTS   0
@@ -142,5 +142,5 @@
 #define LWIP_IPV6_FRAG                  1
 
-/** 
+/**
  * aka Slirp mode.
  */
Index: /trunk/src/VBox/NetworkServices/NAT/portfwd.c
===================================================================
--- /trunk/src/VBox/NetworkServices/NAT/portfwd.c	(revision 53623)
+++ /trunk/src/VBox/NetworkServices/NAT/portfwd.c	(revision 53624)
@@ -173,9 +173,9 @@
     if (sdom == PF_INET) {
         fwspec->src.sin.sin_port = htons(src_port);
-        fwspec->dst.sin.sin_port = htons(dst_port); 
+        fwspec->dst.sin.sin_port = htons(dst_port);
     }
     else { /* PF_INET6 */
         fwspec->src.sin6.sin6_port = htons(src_port);
-        fwspec->dst.sin6.sin6_port = htons(dst_port); 
+        fwspec->dst.sin6.sin6_port = htons(dst_port);
     }
 
Index: /trunk/src/VBox/NetworkServices/NAT/proxy.c
===================================================================
--- /trunk/src/VBox/NetworkServices/NAT/proxy.c	(revision 53623)
+++ /trunk/src/VBox/NetworkServices/NAT/proxy.c	(revision 53624)
@@ -530,5 +530,5 @@
      */
     setsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&linger, sizeof(linger));
-    
+
     closesocket(s);
 }
Index: /trunk/src/VBox/NetworkServices/NAT/pxdns.c
===================================================================
--- /trunk/src/VBox/NetworkServices/NAT/pxdns.c	(revision 53623)
+++ /trunk/src/VBox/NetworkServices/NAT/pxdns.c	(revision 53624)
@@ -694,5 +694,5 @@
         nsent = sendto(pxdns->sock4, req->data, req->size, 0,
                        &resolver->sa, sizeof(resolver->sin));
-        
+
     }
     else if (resolver->sa.sa_family == AF_INET6) {
Index: /trunk/src/VBox/NetworkServices/NAT/pxping.c
===================================================================
--- /trunk/src/VBox/NetworkServices/NAT/pxping.c	(revision 53623)
+++ /trunk/src/VBox/NetworkServices/NAT/pxping.c	(revision 53624)
@@ -796,5 +796,5 @@
         }
     }
-                      
+
     cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
                       " id %04x->%04x", ntohs(pcb->guest_id), ntohs(pcb->host_id));
Index: /trunk/src/VBox/NetworkServices/NAT/pxping_win.c
===================================================================
--- /trunk/src/VBox/NetworkServices/NAT/pxping_win.c	(revision 53623)
+++ /trunk/src/VBox/NetworkServices/NAT/pxping_win.c	(revision 53624)
@@ -547,5 +547,5 @@
         goto out;
     }
-    
+
     pong = NULL;                /* callback owns it now */
   out:
Index: /trunk/src/VBox/NetworkServices/NAT/pxtcp.c
===================================================================
--- /trunk/src/VBox/NetworkServices/NAT/pxtcp.c	(revision 53623)
+++ /trunk/src/VBox/NetworkServices/NAT/pxtcp.c	(revision 53624)
@@ -1721,5 +1721,5 @@
          */
         if (!pxtcp->outbound_close_done) {
-            /* 
+            /*
              * We might still need to poll for POLLOUT, but we can not
              * poll for POLLIN anymore (even if not all data are read)
Index: /trunk/src/VBox/NetworkServices/NAT/winutils.h
===================================================================
--- /trunk/src/VBox/NetworkServices/NAT/winutils.h	(revision 53623)
+++ /trunk/src/VBox/NetworkServices/NAT/winutils.h	(revision 53624)
@@ -175,13 +175,13 @@
     return error == EWOULDBLOCK
 #  if EAGAIN != EWOULDBLOCK
-	|| error == EAGAIN
+        || error == EAGAIN
 #  endif
-	|| error == EINTR
-	|| error == ENOBUFS
-	|| error == ENOMEM;
+        || error == EINTR
+        || error == ENOBUFS
+        || error == ENOMEM;
 # else
     return error == WSAEWOULDBLOCK
-	|| error == WSAEINTR	/* NB: we don't redefine EINTR above */
-	|| error == WSAENOBUFS;
+        || error == WSAEINTR    /* NB: we don't redefine EINTR above */
+        || error == WSAENOBUFS;
 # endif
 }
Index: /trunk/src/VBox/Runtime/common/asn1/asn1-ut-time-template.h
===================================================================
--- /trunk/src/VBox/Runtime/common/asn1/asn1-ut-time-template.h	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/asn1/asn1-ut-time-template.h	(revision 53624)
@@ -44,3 +44,2 @@
 #undef RTASN1TMPL_INT_NAME
 
-
Index: /trunk/src/VBox/Runtime/common/checksum/alt-sha1.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/checksum/alt-sha1.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/checksum/alt-sha1.cpp	(revision 53624)
@@ -499,3 +499,2 @@
 RT_EXPORT_SYMBOL(RTSha1);
 
-
Index: /trunk/src/VBox/Runtime/common/checksum/openssl-sha512.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/checksum/openssl-sha512.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/checksum/openssl-sha512.cpp	(revision 53624)
@@ -108,3 +108,2 @@
 RT_EXPORT_SYMBOL(RTSha384Final);
 
-
Index: /trunk/src/VBox/Runtime/common/checksum/x509.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/checksum/x509.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/checksum/x509.cpp	(revision 53624)
@@ -92,10 +92,10 @@
  * @returns iprt status code.
  *
- * @param   pvBuf                 string representation 
+ * @param   pvBuf                 string representation
  *                                containing X509 certificate
  *                                in PEM format
- * @param   pOutSignature         memory buffer where the binary 
+ * @param   pOutSignature         memory buffer where the binary
  *                                representation will be stored
- * @param   lengthOfSignature     length of X509 certificate in 
+ * @param   lengthOfSignature     length of X509 certificate in
  *                                binary representation
  */
@@ -246,13 +246,13 @@
 
 /**
- * Get X509 certificate basic constraints 
+ * Get X509 certificate basic constraints
  *
  * @returns iprt status code.
  *
- * @param   pvBuf                 string representation 
+ * @param   pvBuf                 string representation
  *                                containing X509 certificate
  *                                in PEM format
  * @param   cbSize                The amount of data (in bytes)
- * @param   pBasicConstraintsOut  memory buffer where the 
+ * @param   pBasicConstraintsOut  memory buffer where the
  *                                extracted basic constraints
  *                                will be stored in string
Index: /trunk/src/VBox/Runtime/common/crypto/pkcs7-init.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/pkcs7-init.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/pkcs7-init.cpp	(revision 53624)
@@ -51,3 +51,2 @@
 #include <iprt/asn1-generator-init.h>
 
-
Index: /trunk/src/VBox/Runtime/common/crypto/pkix-signature-builtin.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/pkix-signature-builtin.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/pkix-signature-builtin.cpp	(revision 53624)
@@ -137,3 +137,2 @@
 }
 
-
Index: /trunk/src/VBox/Runtime/common/crypto/rsa-internal.h
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/rsa-internal.h	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/rsa-internal.h	(revision 53624)
@@ -37,3 +37,2 @@
 #endif
 
-
Index: /trunk/src/VBox/Runtime/common/crypto/rsa-template.h
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/rsa-template.h	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/rsa-template.h	(revision 53624)
@@ -107,3 +107,2 @@
 #undef RTASN1TMPL_INT_NAME
 
-
Index: /trunk/src/VBox/Runtime/common/crypto/spc-init.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/spc-init.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/spc-init.cpp	(revision 53624)
@@ -44,3 +44,2 @@
 #include <iprt/asn1-generator-init.h>
 
-
Index: /trunk/src/VBox/Runtime/common/crypto/spc-sanity.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/spc-sanity.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/spc-sanity.cpp	(revision 53624)
@@ -166,3 +166,2 @@
 #include <iprt/asn1-generator-sanity.h>
 
-
Index: /trunk/src/VBox/Runtime/common/crypto/tsp-core.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/tsp-core.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/tsp-core.cpp	(revision 53624)
@@ -40,3 +40,2 @@
 #include <iprt/asn1-generator-core.h>
 
-
Index: /trunk/src/VBox/Runtime/common/crypto/tsp-sanity.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/tsp-sanity.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/tsp-sanity.cpp	(revision 53624)
@@ -40,3 +40,2 @@
 #include <iprt/asn1-generator-sanity.h>
 
-
Index: /trunk/src/VBox/Runtime/common/crypto/x509-core.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/crypto/x509-core.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/crypto/x509-core.cpp	(revision 53624)
@@ -1532,3 +1532,2 @@
 }
 
-
Index: /trunk/src/VBox/Runtime/common/ldr/Makefile.kup
===================================================================
--- /trunk/src/VBox/Runtime/common/ldr/Makefile.kup	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/ldr/Makefile.kup	(revision 53624)
@@ -1,1 +1,0 @@
-
Index: /trunk/src/VBox/Runtime/common/net/netaddrstr2.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/net/netaddrstr2.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/net/netaddrstr2.cpp	(revision 53624)
@@ -387,5 +387,5 @@
         return VERR_INVALID_PARAMETER;
 
-    return VINF_SUCCESS;    
+    return VINF_SUCCESS;
 }
 RT_EXPORT_SYMBOL(RTNetStrToIPv6Addr);
Index: /trunk/src/VBox/Runtime/common/string/unidata-flags.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/string/unidata-flags.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/string/unidata-flags.cpp	(revision 53624)
@@ -47006,3 +47006,2 @@
 };
 
-
Index: /trunk/src/VBox/Runtime/common/string/unidata-lower.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/string/unidata-lower.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/string/unidata-lower.cpp	(revision 53624)
@@ -3900,3 +3900,2 @@
 };
 
-
Index: /trunk/src/VBox/Runtime/common/string/unidata-upper.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/string/unidata-upper.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/string/unidata-upper.cpp	(revision 53624)
@@ -4067,3 +4067,2 @@
 };
 
-
Index: /trunk/src/VBox/Runtime/common/zip/pkzipvfs.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/zip/pkzipvfs.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/zip/pkzipvfs.cpp	(revision 53624)
@@ -452,5 +452,5 @@
     if (pThis->fZip64Ex && pThis->cdh.cbUncompressed == (uint32_t)-1)
         return pThis->cd64ex.cbUncompressed;
-    
+
     return pThis->cdh.cbUncompressed;
 }
@@ -464,5 +464,5 @@
     if (pThis->fZip64Ex && pThis->cdh.cbCompressed == (uint32_t)-1)
         return pThis->cd64ex.cbCompressed;
-    
+
     return pThis->cdh.cbCompressed;
 }
Index: /trunk/src/VBox/Runtime/common/zip/tarvfs.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/zip/tarvfs.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/zip/tarvfs.cpp	(revision 53624)
@@ -354,9 +354,9 @@
                  && pTar->Common.version[0] == ' '
                  && pTar->Common.version[1] == '\0')
-            enmType = RTZIPTARTYPE_GNU;            
-        else if (   pTar->Common.magic[5]   == '\0' /* VMWare ambiguity - they probably mean posix but */       
+            enmType = RTZIPTARTYPE_GNU;
+        else if (   pTar->Common.magic[5]   == '\0' /* VMWare ambiguity - they probably mean posix but */
                  && pTar->Common.version[0] == ' '  /*                    got the version wrong. */
                  && pTar->Common.version[1] == '\0')
-            enmType = RTZIPTARTYPE_POSIX; 
+            enmType = RTZIPTARTYPE_POSIX;
         else
             return VERR_TAR_NOT_USTAR_V00;
Index: /trunk/src/VBox/Runtime/common/zip/unzipcmd.cpp
===================================================================
--- /trunk/src/VBox/Runtime/common/zip/unzipcmd.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/common/zip/unzipcmd.cpp	(revision 53624)
@@ -183,5 +183,5 @@
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTVfsObjQueryInfo returned %Rrc on '%s'", rc, pszName);
-    
+
     *pcBytes = UnixInfo.cbObject;
 
@@ -407,5 +407,5 @@
     RTZIPUNZIPCMDOPS Opts;
     RT_ZERO(Opts);
-    
+
     RTGETOPTUNION  ValueUnion;
     while (   (rc = RTGetOpt(&GetState, &ValueUnion)) != 0
Index: /trunk/src/VBox/Runtime/r3/socket.cpp
===================================================================
--- /trunk/src/VBox/Runtime/r3/socket.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/r3/socket.cpp	(revision 53624)
@@ -784,5 +784,5 @@
         struct sockaddr_in const *pgrSa = (struct sockaddr_in const *)pgrResult->ai_addr;
         cchIpAddress = RTStrPrintf(szIpAddress, sizeof(szIpAddress),
-				   "%RTnaipv4", pgrSa->sin_addr.s_addr);
+                                   "%RTnaipv4", pgrSa->sin_addr.s_addr);
         Assert(cchIpAddress >= 7 && cchIpAddress < sizeof(szIpAddress) - 1);
         enmAddrType = RTNETADDRTYPE_IPV4;
@@ -793,5 +793,5 @@
         struct sockaddr_in6 const *pgrSa6 = (struct sockaddr_in6 const *)pgrResult->ai_addr;
         cchIpAddress = RTStrPrintf(szIpAddress, sizeof(szIpAddress),
-				   "%RTnaipv6", (PRTNETADDRIPV6)&pgrSa6->sin6_addr);
+                                   "%RTnaipv6", (PRTNETADDRIPV6)&pgrSa6->sin6_addr);
         enmAddrType = RTNETADDRTYPE_IPV6;
         rc = VINF_SUCCESS;
Index: /trunk/src/VBox/Runtime/r3/win/process-win.cpp
===================================================================
--- /trunk/src/VBox/Runtime/r3/win/process-win.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/r3/win/process-win.cpp	(revision 53624)
@@ -613,7 +613,7 @@
 
 /**
- * Creates an environment block out of a handed-in Unicode and 
- * RTENV block. The RTENV block can overwrite entries already 
- * present in the Unicode block. 
+ * Creates an environment block out of a handed-in Unicode and
+ * RTENV block. The RTENV block can overwrite entries already
+ * present in the Unicode block.
  *
  * @return  IPRT status code.
@@ -621,8 +621,8 @@
  * @param   pvEnvBlock          Unicode block (array) of environment entries;
  *                              in form of "FOO=BAR\0BAR=BAZ".
- * @param   hEnv                Handle of an existing RTENV block to use. 
- * @param   fOverwriteExisting  Whether to overwrite existing values of hEnv 
- *                              with the ones defined in pvEnvBlock. 
- * @param   ppwszBlock          Pointer to the final output. 
+ * @param   hEnv                Handle of an existing RTENV block to use.
+ * @param   fOverwriteExisting  Whether to overwrite existing values of hEnv
+ *                              with the ones defined in pvEnvBlock.
+ * @param   ppwszBlock          Pointer to the final output.
  */
 static int rtProcWinEnvironmentCreateInternal(VOID *pvEnvBlock, RTENV hEnv,
@@ -650,10 +650,10 @@
                         rc = RTEnvUnset(pszEntry);
                     }
-                    else if (pszEq) 
+                    else if (pszEq)
                     {
                         const char *pszValue = pszEq + 1;
                         size_t cchVar = pszEq - pszEntry;
                         char *pszVar = (char *)RTMemAlloc(cchVar + 1);
-                        if (pszVar) 
+                        if (pszVar)
                         {
                             memcpy(pszVar, pszEntry, cchVar);
@@ -721,5 +721,5 @@
                 if (pfnCreateEnvironmentBlock(&pvEnvBlockProfile, hToken, FALSE /* Don't inherit from parent. */))
                 {
-                    rc = rtProcWinEnvironmentCreateInternal(pvEnvBlockProfile, hEnv, 
+                    rc = rtProcWinEnvironmentCreateInternal(pvEnvBlockProfile, hEnv,
                                                             false /* fOverwriteExisting */,
                                                             ppwszBlock);
Index: /trunk/src/VBox/Runtime/testcase/tstRTZip.cpp
===================================================================
--- /trunk/src/VBox/Runtime/testcase/tstRTZip.cpp	(revision 53623)
+++ /trunk/src/VBox/Runtime/testcase/tstRTZip.cpp	(revision 53624)
@@ -86,3 +86,2 @@
 }
 
-
Index: /trunk/src/VBox/Storage/VD.cpp
===================================================================
--- /trunk/src/VBox/Storage/VD.cpp	(revision 53623)
+++ /trunk/src/VBox/Storage/VD.cpp	(revision 53624)
@@ -5366,5 +5366,5 @@
     PVDIMAGE pImage = vdGetImageByNumber(pDisk, VD_LAST_IMAGE);
     AssertPtrReturn(pImage, 0);
-    return pImage->Backend->pfnGetSectorSize(pImage->pBackendData);  
+    return pImage->Backend->pfnGetSectorSize(pImage->pBackendData);
 }
 
Index: /trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp	(revision 53624)
@@ -429,5 +429,5 @@
              *        instead of reading the MSR? host EFER doesn't usually
              *        change. */
-            uHostEfer = ASMRdMsr(MSR_K6_EFER);    
+            uHostEfer = ASMRdMsr(MSR_K6_EFER);
             if (uHostEfer & MSR_K6_EFER_FFXSR)
             {
Index: /trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp	(revision 53624)
@@ -459,11 +459,11 @@
 
 /**
- * Translates a USB vesion (a bit-mask) to USB speed (enum). Picks 
- * the highest available version. 
- * 
+ * Translates a USB vesion (a bit-mask) to USB speed (enum). Picks
+ * the highest available version.
+ *
  * @returns VUSBSPEED enum
- *  
+ *
  * @param   iUsbVersion     The USB version.
- * 
+ *
  */
 static VUSBSPEED pdmR3UsbVer2Spd(uint32_t iUsbVersion)
@@ -965,5 +965,5 @@
      * Create and attach the device.
      */
-    rc = pdmR3UsbCreateDevice(pVM, pHub, pUsbDev, -1, pUuid, &pInstanceNode, 
+    rc = pdmR3UsbCreateDevice(pVM, pHub, pUsbDev, -1, pUuid, &pInstanceNode,
                               pdmR3UsbVer2Spd(iUsbVersion), pszCaptureFilename);
     AssertRCReturn(rc, rc);
Index: /trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_3200.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_3200.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/AMD_Athlon_64_3200.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for AMD Athlon(tm) 64 Processor 3200+.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_AMD_Athlon_64_3200[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_AMD_Athlon_64_3200[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x68747541, 0x444d4163, 0x69746e65, 0 },
@@ -63,5 +63,5 @@
  * MSR ranges for AMD Athlon(tm) 64 Processor 3200+.
  */
-static CPUMMSRRANGE const g_aMsrRanges_AMD_Athlon_64_3200[] = 
+static CPUMMSRRANGE const g_aMsrRanges_AMD_Athlon_64_3200[] =
 {
     MAL(0x00000000, "IA32_P5_MC_ADDR", 0x00000402),
@@ -196,5 +196,5 @@
  * Database entry for AMD Athlon(tm) 64 Processor 3200+.
  */
-static CPUMDBENTRY const g_Entry_AMD_Athlon_64_3200 = 
+static CPUMDBENTRY const g_Entry_AMD_Athlon_64_3200 =
 {
     /*.pszName          = */ "AMD Athlon 64 3200+",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/AMD_FX_8150_Eight_Core.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/AMD_FX_8150_Eight_Core.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/AMD_FX_8150_Eight_Core.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for AMD FX(tm)-8150 Eight-Core Processor.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_AMD_FX_8150_Eight_Core[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_AMD_FX_8150_Eight_Core[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x68747541, 0x444d4163, 0x69746e65, 0 },
@@ -85,5 +85,5 @@
  * MSR ranges for AMD FX(tm)-8150 Eight-Core Processor.
  */
-static CPUMMSRRANGE const g_aMsrRanges_AMD_FX_8150_Eight_Core[] = 
+static CPUMMSRRANGE const g_aMsrRanges_AMD_FX_8150_Eight_Core[] =
 {
     MAL(0x00000000, "IA32_P5_MC_ADDR", 0x00000402),
@@ -355,5 +355,5 @@
  * Database entry for AMD FX(tm)-8150 Eight-Core Processor.
  */
-static CPUMDBENTRY const g_Entry_AMD_FX_8150_Eight_Core = 
+static CPUMDBENTRY const g_Entry_AMD_FX_8150_Eight_Core =
 {
     /*.pszName          = */ "AMD FX-8150 Eight-Core",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/AMD_Phenom_II_X6_1100T.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/AMD_Phenom_II_X6_1100T.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/AMD_Phenom_II_X6_1100T.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for AMD Phenom(tm) II X6 1100T Processor.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_AMD_Phenom_II_X6_1100T[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_AMD_Phenom_II_X6_1100T[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x68747541, 0x444d4163, 0x69746e65, 0 },
@@ -70,5 +70,5 @@
  * MSR ranges for AMD Phenom(tm) II X6 1100T Processor.
  */
-static CPUMMSRRANGE const g_aMsrRanges_AMD_Phenom_II_X6_1100T[] = 
+static CPUMMSRRANGE const g_aMsrRanges_AMD_Phenom_II_X6_1100T[] =
 {
     MAL(0x00000000, "IA32_P5_MC_ADDR", 0x00000402),
@@ -244,5 +244,5 @@
  * Database entry for AMD Phenom(tm) II X6 1100T Processor.
  */
-static CPUMDBENTRY const g_Entry_AMD_Phenom_II_X6_1100T = 
+static CPUMDBENTRY const g_Entry_AMD_Phenom_II_X6_1100T =
 {
     /*.pszName          = */ "AMD Phenom II X6 1100T",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i5_3570.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i5_3570.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i5_3570.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for Intel(R) Core(TM) i5-3570 CPU @ 3.40GHz.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Core_i5_3570[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Core_i5_3570[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x756e6547, 0x6c65746e, 0x49656e69, 0 },
@@ -58,5 +58,5 @@
  * MSR ranges for Intel(R) Core(TM) i5-3570 CPU @ 3.40GHz.
  */
-static CPUMMSRRANGE const g_aMsrRanges_Intel_Core_i5_3570[] = 
+static CPUMMSRRANGE const g_aMsrRanges_Intel_Core_i5_3570[] =
 {
     MFX(0x00000000, "IA32_P5_MC_ADDR", Ia32P5McAddr, Ia32P5McAddr, 0, UINT64_C(0xffffffffffffffe0), 0), /* value=0x1f */
@@ -311,5 +311,5 @@
  * Database entry for Intel(R) Core(TM) i5-3570 CPU @ 3.40GHz.
  */
-static CPUMDBENTRY const g_Entry_Intel_Core_i5_3570 = 
+static CPUMDBENTRY const g_Entry_Intel_Core_i5_3570 =
 {
     /*.pszName          = */ "Intel Core i5-3570",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_2635QM.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_2635QM.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_2635QM.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for Intel(R) Core(TM) i7-2635QM CPU @ 2.00GHz.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Core_i7_2635QM[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Core_i7_2635QM[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x756e6547, 0x6c65746e, 0x49656e69, 0 },
@@ -64,5 +64,5 @@
  * MSR ranges for Intel(R) Core(TM) i7-2635QM CPU @ 2.00GHz.
  */
-static CPUMMSRRANGE const g_aMsrRanges_Intel_Core_i7_2635QM[] = 
+static CPUMMSRRANGE const g_aMsrRanges_Intel_Core_i7_2635QM[] =
 {
     MFX(0x00000000, "IA32_P5_MC_ADDR", Ia32P5McAddr, Ia32P5McAddr, 0, UINT64_C(0xffffffffffffffe0), 0), /* value=0x1f */
@@ -302,5 +302,5 @@
  * Database entry for Intel(R) Core(TM) i7-2635QM CPU @ 2.00GHz.
  */
-static CPUMDBENTRY const g_Entry_Intel_Core_i7_2635QM = 
+static CPUMDBENTRY const g_Entry_Intel_Core_i7_2635QM =
 {
     /*.pszName          = */ "Intel Core i7-2635QM",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3820QM.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3820QM.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3820QM.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for Intel(R) Core(TM) i7-3820QM CPU @ 2.70GHz.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Core_i7_3820QM[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Core_i7_3820QM[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x756e6547, 0x6c65746e, 0x49656e69, 0 },
@@ -58,5 +58,5 @@
  * MSR ranges for Intel(R) Core(TM) i7-3820QM CPU @ 2.70GHz.
  */
-static CPUMMSRRANGE const g_aMsrRanges_Intel_Core_i7_3820QM[] = 
+static CPUMMSRRANGE const g_aMsrRanges_Intel_Core_i7_3820QM[] =
 {
     MFX(0x00000000, "IA32_P5_MC_ADDR", Ia32P5McAddr, Ia32P5McAddr, 0, UINT64_C(0xffffffffffffffe0), 0), /* value=0x1f */
@@ -353,5 +353,5 @@
  * Database entry for Intel(R) Core(TM) i7-3820QM CPU @ 2.70GHz.
  */
-static CPUMDBENTRY const g_Entry_Intel_Core_i7_3820QM = 
+static CPUMDBENTRY const g_Entry_Intel_Core_i7_3820QM =
 {
     /*.pszName          = */ "Intel Core i7-3820QM",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3960X.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3960X.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Core_i7_3960X.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for Intel(R) Core(TM) i7-3960X CPU @ 3.30GHz.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Core_i7_3960X[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Core_i7_3960X[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x756e6547, 0x6c65746e, 0x49656e69, 0 },
@@ -67,5 +67,5 @@
  * MSR ranges for Intel(R) Core(TM) i7-3960X CPU @ 3.30GHz.
  */
-static CPUMMSRRANGE const g_aMsrRanges_Intel_Core_i7_3960X[] = 
+static CPUMMSRRANGE const g_aMsrRanges_Intel_Core_i7_3960X[] =
 {
     MFX(0x00000000, "IA32_P5_MC_ADDR", Ia32P5McAddr, Ia32P5McAddr, 0, UINT64_C(0xffffffffffffffe0), 0), /* value=0x1f */
@@ -341,5 +341,5 @@
  * Database entry for Intel(R) Core(TM) i7-3960X CPU @ 3.30GHz.
  */
-static CPUMDBENTRY const g_Entry_Intel_Core_i7_3960X = 
+static CPUMDBENTRY const g_Entry_Intel_Core_i7_3960X =
 {
     /*.pszName          = */ "Intel Core i7-3960X",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_4_3_00GHz.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_4_3_00GHz.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_4_3_00GHz.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for Intel(R) Pentium(R) 4 CPU 3.00GHz.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Pentium_4_3_00GHz[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Pentium_4_3_00GHz[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x756e6547, 0x6c65746e, 0x49656e69, 0 },
@@ -52,5 +52,5 @@
  * MSR ranges for Intel(R) Pentium(R) 4 CPU 3.00GHz.
  */
-static CPUMMSRRANGE const g_aMsrRanges_Intel_Pentium_4_3_00GHz[] = 
+static CPUMMSRRANGE const g_aMsrRanges_Intel_Pentium_4_3_00GHz[] =
 {
     MFO(0x00000000, "IA32_P5_MC_ADDR", Ia32P5McAddr), /* value=0xc55df88 */
@@ -249,5 +249,5 @@
  * Database entry for Intel(R) Pentium(R) 4 CPU 3.00GHz.
  */
-static CPUMDBENTRY const g_Entry_Intel_Pentium_4_3_00GHz = 
+static CPUMDBENTRY const g_Entry_Intel_Pentium_4_3_00GHz =
 {
     /*.pszName          = */ "Intel Pentium 4 3.00GHz",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_M_processor_2_00GHz.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_M_processor_2_00GHz.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Pentium_M_processor_2_00GHz.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for Intel(R) Pentium(R) M processor 2.00GHz.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Pentium_M_processor_2_00GHz[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Pentium_M_processor_2_00GHz[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x756e6547, 0x6c65746e, 0x49656e69, 0 },
@@ -43,5 +43,5 @@
  * MSR ranges for Intel(R) Pentium(R) M processor 2.00GHz.
  */
-static CPUMMSRRANGE const g_aMsrRanges_Intel_Pentium_M_processor_2_00GHz[] = 
+static CPUMMSRRANGE const g_aMsrRanges_Intel_Pentium_M_processor_2_00GHz[] =
 {
     MFI(0x00000000, "IA32_P5_MC_ADDR", Ia32P5McAddr), /* value=0x0 */
@@ -188,5 +188,5 @@
  * Database entry for Intel(R) Pentium(R) M processor 2.00GHz.
  */
-static CPUMDBENTRY const g_Entry_Intel_Pentium_M_processor_2_00GHz = 
+static CPUMDBENTRY const g_Entry_Intel_Pentium_M_processor_2_00GHz =
 {
     /*.pszName          = */ "Intel Pentium M processor 2.00GHz",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Xeon_X5482_3_20GHz.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Xeon_X5482_3_20GHz.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_Xeon_X5482_3_20GHz.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for Intel(R) Xeon(R) CPU           X5482  @ 3.20GHz.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Xeon_X5482_3_20GHz[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_Xeon_X5482_3_20GHz[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x0000000a, 0x756e6547, 0x6c65746e, 0x49656e69, 0 },
@@ -55,5 +55,5 @@
  * MSR ranges for Intel(R) Xeon(R) CPU           X5482  @ 3.20GHz.
  */
-static CPUMMSRRANGE const g_aMsrRanges_Intel_Xeon_X5482_3_20GHz[] = 
+static CPUMMSRRANGE const g_aMsrRanges_Intel_Xeon_X5482_3_20GHz[] =
 {
     MFO(0x00000000, "IA32_P5_MC_ADDR", Ia32P5McAddr), /* value=0x610010 */
@@ -217,5 +217,5 @@
  * Database entry for Intel(R) Xeon(R) CPU           X5482  @ 3.20GHz.
  */
-static CPUMDBENTRY const g_Entry_Intel_Xeon_X5482_3_20GHz = 
+static CPUMDBENTRY const g_Entry_Intel_Xeon_X5482_3_20GHz =
 {
     /*.pszName          = */ "Intel Xeon X5482 3.20GHz",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/Quad_Core_AMD_Opteron_2384.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/Quad_Core_AMD_Opteron_2384.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/Quad_Core_AMD_Opteron_2384.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for Quad-Core AMD Opteron(tm) Processor 2384.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_Quad_Core_AMD_Opteron_2384[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_Quad_Core_AMD_Opteron_2384[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x68747541, 0x444d4163, 0x69746e65, 0 },
@@ -69,5 +69,5 @@
  * MSR ranges for Quad-Core AMD Opteron(tm) Processor 2384.
  */
-static CPUMMSRRANGE const g_aMsrRanges_Quad_Core_AMD_Opteron_2384[] = 
+static CPUMMSRRANGE const g_aMsrRanges_Quad_Core_AMD_Opteron_2384[] =
 {
     MAL(0x00000000, "IA32_P5_MC_ADDR", 0x00000402),
@@ -242,5 +242,5 @@
  * Database entry for Quad-Core AMD Opteron(tm) Processor 2384.
  */
-static CPUMDBENTRY const g_Entry_Quad_Core_AMD_Opteron_2384 = 
+static CPUMDBENTRY const g_Entry_Quad_Core_AMD_Opteron_2384 =
 {
     /*.pszName          = */ "Quad-Core AMD Opteron 2384",
Index: /trunk/src/VBox/VMM/VMMR3/cpus/VIA_QuadCore_L4700_1_2_GHz.h
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/cpus/VIA_QuadCore_L4700_1_2_GHz.h	(revision 53623)
+++ /trunk/src/VBox/VMM/VMMR3/cpus/VIA_QuadCore_L4700_1_2_GHz.h	(revision 53624)
@@ -25,5 +25,5 @@
  * CPUID leaves for VIA QuadCore L4700 @ 1.2+ GHz.
  */
-static CPUMCPUIDLEAF const g_aCpuIdLeaves_VIA_QuadCore_L4700_1_2_GHz[] = 
+static CPUMCPUIDLEAF const g_aCpuIdLeaves_VIA_QuadCore_L4700_1_2_GHz[] =
 {
     { 0x00000000, 0x00000000, 0x00000000, 0x0000000a, 0x746e6543, 0x736c7561, 0x48727561, 0 },
@@ -60,5 +60,5 @@
  * MSR ranges for VIA QuadCore L4700 @ 1.2+ GHz.
  */
-static CPUMMSRRANGE const g_aMsrRanges_VIA_QuadCore_L4700_1_2_GHz[] = 
+static CPUMMSRRANGE const g_aMsrRanges_VIA_QuadCore_L4700_1_2_GHz[] =
 {
     RVI(0x00000000, 0x00000005, "ZERO_0000_0000_THRU_0000_0005", 0),
@@ -376,5 +376,5 @@
  * Database entry for VIA QuadCore L4700 @ 1.2+ GHz.
  */
-static CPUMDBENTRY const g_Entry_VIA_QuadCore_L4700_1_2_GHz = 
+static CPUMDBENTRY const g_Entry_VIA_QuadCore_L4700_1_2_GHz =
 {
     /*.pszName          = */ "VIA QuadCore L4700 1.2+ GHz",
Index: /trunk/src/VBox/ValidationKit/testdriver/win-vbox-net-drvstore-cleanup.ps1
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/win-vbox-net-drvstore-cleanup.ps1	(revision 53623)
+++ /trunk/src/VBox/ValidationKit/testdriver/win-vbox-net-drvstore-cleanup.ps1	(revision 53624)
Index: /trunk/src/VBox/ValidationKit/testdriver/win-vbox-net-uninstall.ps1
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/win-vbox-net-uninstall.ps1	(revision 53623)
+++ /trunk/src/VBox/ValidationKit/testdriver/win-vbox-net-uninstall.ps1	(revision 53624)
Index: /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py	(revision 53623)
+++ /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py	(revision 53624)
@@ -245,3 +245,2 @@
         WuiHlpLineGraph.__init__(self, sId, oData, fErrorBarY = True);
 
-
Index: /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py	(revision 53623)
+++ /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py	(revision 53624)
@@ -321,3 +321,2 @@
         return self._produceSvg(oFigure, False);
 
-
Index: /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphsimple.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphsimple.py	(revision 53623)
+++ /trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphsimple.py	(revision 53624)
@@ -145,3 +145,2 @@
     pass;
 
-
Index: /trunk/src/recompiler/target-i386/exec.h
===================================================================
--- /trunk/src/recompiler/target-i386/exec.h	(revision 53623)
+++ /trunk/src/recompiler/target-i386/exec.h	(revision 53624)
@@ -146,23 +146,23 @@
 #ifdef VBOX
 # ifdef IPRT_NO_CRT
-#  undef  sin  
-#  undef  cos  
-#  undef  sqrt 
-#  undef  pow  
-#  undef  log  
-#  undef  tan  
+#  undef  sin
+#  undef  cos
+#  undef  sqrt
+#  undef  pow
+#  undef  log
+#  undef  tan
 #  undef  atan2
 #  undef  floor
-#  undef  ceil 
+#  undef  ceil
 #  undef  ldexp
-#  define sin   sinl  
-#  define cos   cosl  
-#  define sqrt  sqrtl 
-#  define pow   powl  
-#  define log   logl  
-#  define tan   tanl  
+#  define sin   sinl
+#  define cos   cosl
+#  define sqrt  sqrtl
+#  define pow   powl
+#  define log   logl
+#  define tan   tanl
 #  define atan2 atan2l
 #  define floor floorl
-#  define ceil  ceill 
+#  define ceil  ceill
 #  define ldexp ldexpl
 # endif
Index: /trunk/src/recompiler/target-i386/op_helper.c
===================================================================
--- /trunk/src/recompiler/target-i386/op_helper.c	(revision 53623)
+++ /trunk/src/recompiler/target-i386/op_helper.c	(revision 53624)
@@ -3240,5 +3240,5 @@
                 new_cs = new_cs & 0xfffc;
             }
-            else 
+            else
             {
                 /* Ugly assumption: assume a genuine switch to ring-1. */
