Changeset 60639 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Timestamp:

Apr 22, 2016 7:37:54 AM (9 years ago)

Author:

vboxsync

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

106799

Message:

HostDrivers/win: coding style

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• cfg/VBoxNetCfg.cpp (modified) (1 diff)
• drv/VBoxNetFltRt-win.h (modified) (17 diffs)
• tools/VBoxNetAdpInstall.cpp (modified) (1 diff)
• tools/VBoxNetAdpUninstall.cpp (modified) (1 diff)
• tools/VBoxNetFltInstall.cpp (modified) (7 diffs)
• tools/VBoxNetFltUninstall.cpp (modified) (4 diffs)
• tools/VBoxNetLwfInstall.cpp (modified) (6 diffs)
• tools/VBoxNetLwfUninstall.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

@@ -3500 +3500 @@
     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);
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h

@@ -81 +81 @@
 {
     PLIST_ENTRY pListEntry = RemoveHeadList(pQueue);
-    if(pListEntry != pQueue)
+    if (pListEntry != pQueue)
     {
         PVBOXNETFLT_PACKET_INFO pInfo = LIST_ENTRY_2_PACKET_INFO(pListEntry);
@@ -93 +93 @@
 {
     PLIST_ENTRY pListEntry = RemoveTailList(pQueue);
-    if(pListEntry != pQueue)
+    if (pListEntry != pQueue)
     {
         PVBOXNETFLT_PACKET_INFO pInfo = LIST_ENTRY_2_PACKET_INFO(pListEntry);
@@ -192 +192 @@
     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 +218 @@
     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 +243 @@
     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 +280 @@
     pEntry->Next = pList->Head.Next;
     pList->Head.Next = pEntry;
-    if(!pEntry->Next)
+    if (!pEntry->Next)
         pList->pTail = pEntry;
 }
@@ -287 +287 @@
 {
     PSINGLE_LIST_ENTRY pEntry = pList->Head.Next;
-    if(pEntry && pEntry == pList->pTail)
+    if (pEntry && pEntry == pList->pTail)
     {
         pList->Head.Next = NULL;
@@ -589 +589 @@
     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 +599 @@
     }
 
-    if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
+    if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
     {
         vboxNetFltWinReferenceModePassThru(pNetFlt);
@@ -620 +620 @@
 
     Assert(v);
-    if(!v)
+    if (!v)
     {
         *pbNetFltActive = false;
@@ -628 +628 @@
     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 +638 @@
     }
 
-    if(pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
+    if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)
     {
         vboxNetFltWinIncReferenceModePassThru(pNetFlt, v);
@@ -654 +654 @@
 
     /* 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 +667 @@
 {
     uint32_t i;
-    for(i = 0; i < n; i++)
+    for (i = 0; i < n; i++)
     {
         vboxNetFltRelease(pNetFlt, true);
@@ -703 +703 @@
 {
     Assert(v);
-    if(!v)
+    if (!v)
     {
         return false;
@@ -710 +710 @@
     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 +727 @@
     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
     {

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp

@@ -55 +55 @@
             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");

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp

@@ -41 +41 @@
 
     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");

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp

@@ -42 +42 @@
     LPWSTR pwszFilePart;
     DWORD dwSize = GetFullPathNameW(pwszName, (DWORD)cchFull, pwszFull, &pwszFilePart);
-    if(dwSize <= 0)
+    if (dwSize <= 0)
         return dwSize;
 
@@ -50 +50 @@
         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 +85 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         int i = 0;
@@ -91 +91 @@
         {
             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 +106 @@
                         LPCWSTR aInfs[] = {PtInf, MpInf};
                         hr = VBoxNetCfgWinNetFltInstall(pnc, aInfs, 2);
-                        if(hr == S_OK)
+                        if (hr == S_OK)
                         {
                             wprintf(L"installed successfully\n");
@@ -132 +132 @@
                 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 +153 @@
                 break;
             }
-        } while(true);
+        } while (true);
 
         CoUninitialize();

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp

@@ -39 +39 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         int i = 0;
@@ -45 +45 @@
         {
             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 +62 @@
                 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 +83 @@
                 break;
             }
-        } while(true);
+        } while (true);
 
         CoUninitialize();

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp

@@ -40 +40 @@
     LPWSTR pwszFilePart;
     DWORD dwSize = GetFullPathNameW(pwszName, (DWORD)cchFull, pwszFull, &pwszFilePart);
-    if(dwSize <= 0)
+    if (dwSize <= 0)
         return dwSize;
 
@@ -48 +48 @@
         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 +82 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         int i = 0;
@@ -88 +88 @@
         {
             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 +116 @@
                 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 +137 @@
                 break;
             }
-        } while(true);
+        } while (true);
 
         CoUninitialize();

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp

@@ -36 +36 @@
 
     HRESULT hr = CoInitialize(NULL);
-    if(hr == S_OK)
+    if (hr == S_OK)
     {
         int i = 0;
@@ -42 +42 @@
         {
             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 +59 @@
                 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 +80 @@
                 break;
             }
-        } while(true);
+        } while (true);
 
         CoUninitialize();