Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp	(revision 60639)
@@ -3500,11 +3500,11 @@
     rc = vboxLoadIpHelpFunctions(hModule);
 
-    if(SUCCEEDED(rc))
+    if (SUCCEEDED(rc))
         rc = vboxNetCfgWinGetInterfaceLUID(hKey, &luid);
 
-    if(SUCCEEDED(rc))
+    if (SUCCEEDED(rc))
         rc = vboxNetCfgWinGetLoopbackMetric(&loopbackMetric);
 
-    if(SUCCEEDED(rc))
+    if (SUCCEEDED(rc))
         rc = vboxNetCfgWinSetInterfaceMetric(&luid, loopbackMetric - 1);
 
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h	(revision 60639)
@@ -81,5 +81,5 @@
 {
     PLIST_ENTRY pListEntry = RemoveHeadList(pQueue);
-    if(pListEntry != pQueue)
+    if (pListEntry != pQueue)
     {
         PVBOXNETFLT_PACKET_INFO pInfo = LIST_ENTRY_2_PACKET_INFO(pListEntry);
@@ -93,5 +93,5 @@
 {
     PLIST_ENTRY pListEntry = RemoveTailList(pQueue);
-    if(pListEntry != pQueue)
+    if (pListEntry != pQueue)
     {
         PVBOXNETFLT_PACKET_INFO pInfo = LIST_ENTRY_2_PACKET_INFO(pListEntry);
@@ -192,12 +192,12 @@
     PSINGLE_LIST_ENTRY pCur;
     PSINGLE_LIST_ENTRY pPrev;
-    for(pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
-    {
-        if(pEntry2Search == pCur)
+    for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
+    {
+        if (pEntry2Search == pCur)
         {
-            if(bRemove)
+            if (bRemove)
             {
                 pPrev->Next = pCur->Next;
-                if(pCur == pList->pTail)
+                if (pCur == pList->pTail)
                 {
                     pList->pTail = pPrev;
@@ -218,13 +218,13 @@
     PSINGLE_LIST_ENTRY pPrev;
     PNDIS_PACKET pCurPacket;
-    for(pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
+    for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
     {
         pCurPacket = VBOX_SLE_2_SENDPACKET(pCur);
-        if(pCurPacket == pPacket2Search || vboxNetFltWinMatchPackets(pPacket2Search, pCurPacket, cbMatch))
+        if (pCurPacket == pPacket2Search || vboxNetFltWinMatchPackets(pPacket2Search, pCurPacket, cbMatch))
         {
-            if(bRemove)
+            if (bRemove)
             {
                 pPrev->Next = pCur->Next;
-                if(pCur == pList->pTail)
+                if (pCur == pList->pTail)
                 {
                     pList->pTail = pPrev;
@@ -243,13 +243,13 @@
     PSINGLE_LIST_ENTRY pPrev;
     PNDIS_PACKET pCurPacket;
-    for(pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
+    for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)
     {
         pCurPacket = VBOX_SLE_2_SENDPACKET(pCur);
-        if(vboxNetFltWinMatchPacketAndSG(pCurPacket, pSG, cbMatch))
+        if (vboxNetFltWinMatchPacketAndSG(pCurPacket, pSG, cbMatch))
         {
-            if(bRemove)
+            if (bRemove)
             {
                 pPrev->Next = pCur->Next;
-                if(pCur == pList->pTail)
+                if (pCur == pList->pTail)
                 {
                     pList->pTail = pPrev;
@@ -280,5 +280,5 @@
     pEntry->Next = pList->Head.Next;
     pList->Head.Next = pEntry;
-    if(!pEntry->Next)
+    if (!pEntry->Next)
         pList->pTail = pEntry;
 }
@@ -287,5 +287,5 @@
 {
     PSINGLE_LIST_ENTRY pEntry = pList->Head.Next;
-    if(pEntry && pEntry == pList->pTail)
+    if (pEntry && pEntry == pList->pTail)
     {
         pList->Head.Next = NULL;
@@ -589,7 +589,7 @@
     RTSpinlockAcquire((pNetFlt)->hSpinlock);
 #ifndef VBOXNETADP
-    if(!vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))
-#else
-    if(!vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))
+    if (!vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))
+#else
+    if (!vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))
 #endif
     {
@@ -599,5 +599,5 @@
     }
 
-    if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
+    if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
     {
         vboxNetFltWinReferenceModePassThru(pNetFlt);
@@ -620,5 +620,5 @@
 
     Assert(v);
-    if(!v)
+    if (!v)
     {
         *pbNetFltActive = false;
@@ -628,7 +628,7 @@
     RTSpinlockAcquire((pNetFlt)->hSpinlock);
 #ifndef VBOXNETADP
-    if(!vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))
-#else
-    if(!vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))
+    if (!vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))
+#else
+    if (!vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))
 #endif
     {
@@ -638,5 +638,5 @@
     }
 
-    if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
+    if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
     {
         vboxNetFltWinIncReferenceModePassThru(pNetFlt, v);
@@ -654,5 +654,5 @@
 
     /* we have marked it as busy, so can do the res references outside the lock */
-    for(i = 0; i < v-1; i++)
+    for (i = 0; i < v-1; i++)
     {
         vboxNetFltRetain(pNetFlt, true /* fBusy */);
@@ -667,5 +667,5 @@
 {
     uint32_t i;
-    for(i = 0; i < n; i++)
+    for (i = 0; i < n; i++)
     {
         vboxNetFltRelease(pNetFlt, true);
@@ -703,5 +703,5 @@
 {
     Assert(v);
-    if(!v)
+    if (!v)
     {
         return false;
@@ -710,7 +710,7 @@
     RTSpinlockAcquire(pNetFlt->hSpinlock);
 #ifdef VBOXNETADP
-    if(vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))
-#else
-    if(vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))
+    if (vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))
+#else
+    if (vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))
 #endif
     {
@@ -727,7 +727,7 @@
     RTSpinlockAcquire(pNetFlt->hSpinlock);
 #ifdef VBOXNETADP
-    if(vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))
-#else
-    if(vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))
+    if (vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))
+#else
+    if (vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))
 #endif
     {
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp	(revision 60639)
@@ -55,10 +55,10 @@
             LPWSTR lpszLockedBy = NULL;
             hr = VBoxNetCfgWinQueryINetCfg(&pnc, TRUE, VBOX_NETADP_APP_NAME, 10000, &lpszLockedBy);
-            if(hr == S_OK)
+            if (hr == S_OK)
             {
 
                 hr = VBoxNetCfgWinNetAdpInstall(pnc, MpInf);
 
-                if(hr == S_OK)
+                if (hr == S_OK)
                 {
                     wprintf(L"installed successfully\n");
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp	(revision 60639)
@@ -41,11 +41,11 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         hr = VBoxNetCfgWinRemoveAllNetDevicesOfId(VBOX_NETADP_HWID);
-        if(hr == S_OK)
+        if (hr == S_OK)
         {
             hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, L"Net", VBOX_NETADP_HWID, 0/* could be SUOI_FORCEDELETE */);
-            if(hr == S_OK)
+            if (hr == S_OK)
             {
                 printf("uninstalled successfully\n");
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp	(revision 60639)
@@ -42,5 +42,5 @@
     LPWSTR pwszFilePart;
     DWORD dwSize = GetFullPathNameW(pwszName, (DWORD)cchFull, pwszFull, &pwszFilePart);
-    if(dwSize <= 0)
+    if (dwSize <= 0)
         return dwSize;
 
@@ -50,16 +50,16 @@
         WCHAR wsz[512];
         DWORD cch = GetModuleFileNameW(GetModuleHandle(NULL), &wsz[0], sizeof(wsz) / sizeof(wsz[0]));
-        if(cch > 0)
+        if (cch > 0)
         {
-            while(cch > 0 && wsz[cch - 1] != '/' && wsz[cch - 1] != '\\' && wsz[cch - 1] != ':')
+            while (cch > 0 && wsz[cch - 1] != '/' && wsz[cch - 1] != '\\' && wsz[cch - 1] != ':')
                 cch--;
             unsigned i = 0;
-            while(cch < sizeof(wsz) / sizeof(wsz[0]))
+            while (cch < sizeof(wsz) / sizeof(wsz[0]))
             {
                 wsz[cch] = pwszFilePart[i++];
-                if(!wsz[cch])
+                if (!wsz[cch])
                 {
                     dwSize = GetFullPathNameW(wsz, (DWORD)cchFull, pwszFull, NULL);
-                    if(dwSize > 0 && GetFileAttributesW(pwszFull) != INVALID_FILE_ATTRIBUTES)
+                    if (dwSize > 0 && GetFileAttributesW(pwszFull) != INVALID_FILE_ATTRIBUTES)
                         return dwSize;
                     break;
@@ -85,5 +85,5 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         int i = 0;
@@ -91,14 +91,14 @@
         {
             hr = VBoxNetCfgWinQueryINetCfg(&pnc, TRUE, VBOX_NETCFG_APP_NAME, 10000, &lpszLockedBy);
-            if(hr == S_OK)
+            if (hr == S_OK)
             {
                 DWORD dwSize;
                 dwSize = MyGetfullPathNameW(VBOX_NETFLT_PT_INF, sizeof(PtInf)/sizeof(PtInf[0]), PtInf);
-                if(dwSize > 0)
+                if (dwSize > 0)
                 {
                     /** @todo add size check for (sizeof(PtInf)/sizeof(PtInf[0])) == dwSize (string length in sizeof(PtInf[0])) */
 
                     dwSize = MyGetfullPathNameW(VBOX_NETFLT_MP_INF, sizeof(MpInf)/sizeof(MpInf[0]), MpInf);
-                    if(dwSize > 0)
+                    if (dwSize > 0)
                     {
                         /** @todo add size check for (sizeof(MpInf)/sizeof(MpInf[0])) == dwSize (string length in sizeof(MpInf[0])) */
@@ -106,5 +106,5 @@
                         LPCWSTR aInfs[] = {PtInf, MpInf};
                         hr = VBoxNetCfgWinNetFltInstall(pnc, aInfs, 2);
-                        if(hr == S_OK)
+                        if (hr == S_OK)
                         {
                             wprintf(L"installed successfully\n");
@@ -132,7 +132,7 @@
                 break;
             }
-            else if(hr == NETCFG_E_NO_WRITE_LOCK && lpszLockedBy)
+            else if (hr == NETCFG_E_NO_WRITE_LOCK && lpszLockedBy)
             {
-                if(i < VBOX_NETFLT_RETRIES && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
+                if (i < VBOX_NETFLT_RETRIES && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
                 {
                     wprintf(L"6to4svc.dll is holding the lock, retrying %d out of %d\n", ++i, VBOX_NETFLT_RETRIES);
@@ -153,5 +153,5 @@
                 break;
             }
-        } while(true);
+        } while (true);
 
         CoUninitialize();
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp	(revision 60639)
@@ -39,5 +39,5 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         int i = 0;
@@ -45,8 +45,8 @@
         {
             hr = VBoxNetCfgWinQueryINetCfg(&pnc, TRUE, VBOX_NETCFG_APP_NAME, 10000, &lpszLockedBy);
-            if(hr == S_OK)
+            if (hr == S_OK)
             {
                 hr = VBoxNetCfgWinNetFltUninstall(pnc);
-                if(hr != S_OK && hr != S_FALSE)
+                if (hr != S_OK && hr != S_FALSE)
                 {
                     wprintf(L"error uninstalling VBoxNetFlt (0x%x)\n", hr);
@@ -62,7 +62,7 @@
                 break;
             }
-            else if(hr == NETCFG_E_NO_WRITE_LOCK && lpszLockedBy)
+            else if (hr == NETCFG_E_NO_WRITE_LOCK && lpszLockedBy)
             {
-                if(i < VBOX_NETFLT_RETRIES && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
+                if (i < VBOX_NETFLT_RETRIES && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
                 {
                     wprintf(L"6to4svc.dll is holding the lock, retrying %d out of %d\n", ++i, VBOX_NETFLT_RETRIES);
@@ -83,5 +83,5 @@
                 break;
             }
-        } while(true);
+        } while (true);
 
         CoUninitialize();
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp	(revision 60639)
@@ -40,5 +40,5 @@
     LPWSTR pwszFilePart;
     DWORD dwSize = GetFullPathNameW(pwszName, (DWORD)cchFull, pwszFull, &pwszFilePart);
-    if(dwSize <= 0)
+    if (dwSize <= 0)
         return dwSize;
 
@@ -48,16 +48,16 @@
         WCHAR wsz[512];
         DWORD cch = GetModuleFileNameW(GetModuleHandle(NULL), &wsz[0], sizeof(wsz) / sizeof(wsz[0]));
-        if(cch > 0)
+        if (cch > 0)
         {
-            while(cch > 0 && wsz[cch - 1] != '/' && wsz[cch - 1] != '\\' && wsz[cch - 1] != ':')
+            while (cch > 0 && wsz[cch - 1] != '/' && wsz[cch - 1] != '\\' && wsz[cch - 1] != ':')
                 cch--;
             unsigned i = 0;
-            while(cch < sizeof(wsz) / sizeof(wsz[0]))
+            while (cch < sizeof(wsz) / sizeof(wsz[0]))
             {
                 wsz[cch] = pwszFilePart[i++];
-                if(!wsz[cch])
+                if (!wsz[cch])
                 {
                     dwSize = GetFullPathNameW(wsz, (DWORD)cchFull, pwszFull, NULL);
-                    if(dwSize > 0 && GetFileAttributesW(pwszFull) != INVALID_FILE_ATTRIBUTES)
+                    if (dwSize > 0 && GetFileAttributesW(pwszFull) != INVALID_FILE_ATTRIBUTES)
                         return dwSize;
                     break;
@@ -82,5 +82,5 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         int i = 0;
@@ -88,13 +88,13 @@
         {
             hr = VBoxNetCfgWinQueryINetCfg(&pnc, TRUE, VBOX_NETCFG_APP_NAME, 10000, &lpszLockedBy);
-            if(hr == S_OK)
+            if (hr == S_OK)
             {
                 DWORD dwSize;
                 dwSize = MyGetfullPathNameW(VBOX_NETLWF_INF, sizeof(Inf)/sizeof(Inf[0]), Inf);
-                if(dwSize > 0)
+                if (dwSize > 0)
                 {
                     /** @todo add size check for (sizeof(Inf)/sizeof(Inf[0])) == dwSize (string length in sizeof(Inf[0])) */
                     hr = VBoxNetCfgWinNetLwfInstall(pnc, Inf);
-                    if(hr == S_OK)
+                    if (hr == S_OK)
                     {
                         wprintf(L"installed successfully\n");
@@ -116,7 +116,7 @@
                 break;
             }
-            else if(hr == NETCFG_E_NO_WRITE_LOCK && lpszLockedBy)
+            else if (hr == NETCFG_E_NO_WRITE_LOCK && lpszLockedBy)
             {
-                if(i < VBOX_NETLWF_RETRIES && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
+                if (i < VBOX_NETLWF_RETRIES && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
                 {
                     wprintf(L"6to4svc.dll is holding the lock, retrying %d out of %d\n", ++i, VBOX_NETLWF_RETRIES);
@@ -137,5 +137,5 @@
                 break;
             }
-        } while(true);
+        } while (true);
 
         CoUninitialize();
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp	(revision 60639)
@@ -36,5 +36,5 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         int i = 0;
@@ -42,8 +42,8 @@
         {
             hr = VBoxNetCfgWinQueryINetCfg(&pnc, TRUE, VBOX_NETCFG_APP_NAME, 10000, &lpszLockedBy);
-            if(hr == S_OK)
+            if (hr == S_OK)
             {
                 hr = VBoxNetCfgWinNetLwfUninstall(pnc);
-                if(hr != S_OK)
+                if (hr != S_OK)
                 {
                     wprintf(L"error uninstalling VBoxNetLwf (0x%x)\n", hr);
@@ -59,7 +59,7 @@
                 break;
             }
-            else if(hr == NETCFG_E_NO_WRITE_LOCK && lpszLockedBy)
+            else if (hr == NETCFG_E_NO_WRITE_LOCK && lpszLockedBy)
             {
-                if(i < VBOX_NETLWF_RETRIES && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
+                if (i < VBOX_NETLWF_RETRIES && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
                 {
                     wprintf(L"6to4svc.dll is holding the lock, retrying %d out of %d\n", ++i, VBOX_NETLWF_RETRIES);
@@ -80,5 +80,5 @@
                 break;
             }
-        } while(true);
+        } while (true);
 
         CoUninitialize();
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp	(revision 60639)
@@ -102,5 +102,5 @@
     USHORT cbUrb = sizeof (struct _URB_CONTROL_DESCRIPTOR_REQUEST);
     PURB pUrb = VBoxUsbToolUrbAllocZ(URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, cbUrb);
-    if(!pUrb)
+    if (!pUrb)
     {
         WARN(("allocating URB failed"));
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp	(revision 60639)
@@ -239,5 +239,5 @@
                 if (fAbortPipes)
                 {
-                    for(j=0; j<pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo->NumberOfPipes; j++)
+                    for (j=0; j<pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo->NumberOfPipes; j++)
                     {
                         Log(("Aborting Pipe %d handle %x address %x\n", j,
@@ -563,5 +563,5 @@
     {
         pUrb = VBoxUsbToolUrbAllocZ(URB_FUNCTION_SELECT_CONFIGURATION, sizeof (struct _URB_SELECT_CONFIGURATION));
-        if(!pUrb)
+        if (!pUrb)
         {
             AssertMsgFailed((__FUNCTION__": VBoxUsbToolUrbAlloc failed\n"));
@@ -574,5 +574,5 @@
 
         Status = VBoxUsbToolUrbPost(pDevExt->pLowerDO, pUrb, RT_INDEFINITE_WAIT);
-        if(NT_SUCCESS(Status) && USBD_SUCCESS(pUrb->UrbHeader.Status))
+        if (NT_SUCCESS(Status) && USBD_SUCCESS(pUrb->UrbHeader.Status))
         {
             pDevExt->Rt.hConfiguration = pUrb->UrbSelectConfiguration.ConfigurationHandle;
@@ -776,5 +776,5 @@
     {
         /* Clear pipes associated with the interface, else Windows may hang. */
-        for(ULONG i = 0; i < pDevExt->Rt.pVBIfaceInfo[InterfaceNumber].pInterfaceInfo->NumberOfPipes; i++)
+        for (ULONG i = 0; i < pDevExt->Rt.pVBIfaceInfo[InterfaceNumber].pInterfaceInfo->NumberOfPipes; i++)
             VBoxUsbToolPipeClear(pDevExt->pLowerDO, pDevExt->Rt.pVBIfaceInfo[InterfaceNumber].pInterfaceInfo->Pipes[i].PipeHandle, FALSE);
     }
@@ -831,5 +831,5 @@
 
             Assert(pIfInfo->NumberOfPipes == pIfDr->bNumEndpoints);
-            for(ULONG i = 0; i < pIfInfo->NumberOfPipes; i++)
+            for (ULONG i = 0; i < pIfInfo->NumberOfPipes; i++)
             {
                 pDevExt->Rt.pVBIfaceInfo[InterfaceNumber].pPipeInfo[i].EndpointAddress = pIfInfo->Pipes[i].EndpointAddress;
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp	(revision 60639)
@@ -1419,5 +1419,5 @@
     else
     {
-        if(pDevice->enmState != VBOXUSBFLT_DEVSTATE_REPLUGGING)
+        if (pDevice->enmState != VBOXUSBFLT_DEVSTATE_REPLUGGING)
         {
             WARN(("invalid state, %d", pDevice->enmState));
Index: /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp	(revision 60638)
+++ /trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp	(revision 60639)
@@ -659,5 +659,5 @@
 
     ASSERT_WARN(!pData->pDrvObj, ("pDrvObj expected null on enter, but was(0x%p)", pData->pDrvObj));
-    if(pDrvObj)
+    if (pDrvObj)
     {
         LOG(("found driver object 0x%p", pDrvObj));
@@ -791,5 +791,5 @@
                             if (Status != STATUS_SUCCESS || !bFiltered)
                             {
-                                if(Status == STATUS_SUCCESS)
+                                if (Status == STATUS_SUCCESS)
                                 {
                                     LOG(("PDO (0x%p) is NOT filtered", pDevObj));
@@ -813,8 +813,8 @@
                         LOG(("BusQueryHardwareIDs"));
 #ifdef VBOX_USB_WITH_VERBOSE_LOGGING
-                        while(*pId) //MULTI_SZ
+                        while (*pId) //MULTI_SZ
                         {
                             LOG_STRW(pId);
-                            while(*pId) pId++;
+                            while (*pId) pId++;
                             pId++;
                         }
@@ -831,5 +831,5 @@
                         if (Status != STATUS_SUCCESS || !bFiltered)
                         {
-                            if(Status == STATUS_SUCCESS)
+                            if (Status == STATUS_SUCCESS)
                             {
                                 LOG(("PDO (0x%p) is NOT filtered", pDevObj));
@@ -849,9 +849,9 @@
                         LOG(("NEW BusQueryHardwareIDs"));
                         pTmp = pId;
-                        while(*pTmp) //MULTI_SZ
+                        while (*pTmp) //MULTI_SZ
                         {
 
                             LOG_STRW(pTmp);
-                            while(*pTmp) pTmp++;
+                            while (*pTmp) pTmp++;
                             pTmp++;
                         }
@@ -864,8 +864,8 @@
                         LOG(("BusQueryCompatibleIDs"));
 #ifdef VBOX_USB_WITH_VERBOSE_LOGGING
-                        while(*pId) //MULTI_SZ
+                        while (*pId) //MULTI_SZ
                         {
                             LOG_STRW(pId);
-                            while(*pId) pId++;
+                            while (*pId) pId++;
                             pId++;
                         }
@@ -884,8 +884,8 @@
                             LOG(("NEW BusQueryCompatibleIDs"));
                             pTmp = pId;
-                            while(*pTmp) //MULTI_SZ
+                            while (*pTmp) //MULTI_SZ
                             {
                                 LOG_STRW(pTmp);
-                                while(*pTmp) pTmp++;
+                                while (*pTmp) pTmp++;
                                 pTmp++;
                             }
@@ -1090,5 +1090,5 @@
     LOG(("==>PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x)", vboxUsbDbgStrPnPMn(IoGetCurrentIrpStackLocation(pIrp)->MinorFunction), pDevObj, pIrp, pIrp->IoStatus.Status));
 
-    if(!VBoxUsbHookRetain(pHook))
+    if (!VBoxUsbHookRetain(pHook))
     {
         WARN(("VBoxUsbHookRetain failed"));