Changeset 28668 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Apr 23, 2010 5:47:06 PM (15 years ago)

Author:

vboxsync

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

60539

Message:

build fixes.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• VBoxNetFlt-win.h (modified) (2 diffs)
• VBoxNetFltMp-win.c (modified) (4 diffs)
• VBoxNetFltPt-win.c (modified) (4 diffs)

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

@@ -427 +427 @@
     do { \
         Assert(!vboxNetFltWinCheckMACs(_p, NULL, &g_vboxNetFltWinVerifyMACGuest)); \
-        Assert(!vboxNetFltWinCheckMACs(_p, NULL, &(_pnf)->u.s.Mac)); \
+        Assert(!vboxNetFltWinCheckMACs(_p, NULL, &(_pnf)->u.s.MacAddr)); \
     } while(0)
 
@@ -433 +433 @@
     do { \
         Assert(!vboxNetFltWinCheckMACsSG(_p, NULL, &g_vboxNetFltWinVerifyMACGuest)); \
-        Assert(!vboxNetFltWinCheckMACsSG(_p, NULL, &(_pnf)->u.s.Mac)); \
+        Assert(!vboxNetFltWinCheckMACsSG(_p, NULL, &(_pnf)->u.s.MacAddr)); \
     } while(0)
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltMp-win.c

@@ -31 +31 @@
 
 /** driver handle */
-static NDIS_HANDLE         g_hDriverHandle = NULL;
+static NDIS_HANDLE      g_hDriverHandle            = NULL;
 /** Ndis wrapper handle */
-static NDIS_HANDLE        g_hNdisWrapperHandle;
+static NDIS_HANDLE      g_hNdisWrapperHandle;
 /** device handle for ioctl interface this is not used currently and should be removed soon */
-static NDIS_HANDLE     g_hNdisDeviceHandle = NULL;
+static NDIS_HANDLE      g_hNdisDeviceHandle        = NULL;
 /** device object used for ioctl interface this is not used currently and should be removed soon */
-static PDEVICE_OBJECT  g_pControlDeviceObject = NULL;
+static PDEVICE_OBJECT   g_pControlDeviceObject     = NULL;
 /** ioctl device ref count */
-static LONG               g_cControlDeviceRefs = 0;
+static LONG             g_cControlDeviceRefs       = 0;
 /** true if control device needs to be dereferenced before destroying */
-static bool g_bControlDeviceReferenced = false;
+static bool             g_bControlDeviceReferenced = false;
 
 enum _DEVICE_STATE
@@ -588 +588 @@
     }
 
-    pThis->u.s.Mac = mac;
+    pThis->u.s.MacAddr = mac;
 
     return NDIS_STATUS_SUCCESS;
@@ -1863 +1863 @@
             {
                 PVBOXNETFLTINS pNetFlt = (PADAPT_2_PVBOXNETFLTINS(pAdapt));
-                pInfo = &pNetFlt->u.s.Mac;
+                pInfo = &pNetFlt->u.s.MacAddr;
                 ulInfoLen = VBOXNETADP_ETH_ADDRESS_LENGTH;
             }
@@ -1877 +1877 @@
             {
                 PVBOXNETFLTINS pNetFlt = (PADAPT_2_PVBOXNETFLTINS(pAdapt));
-                pInfo = &pNetFlt->u.s.Mac;
+                pInfo = &pNetFlt->u.s.MacAddr;
                 ulInfoLen = VBOXNETADP_ETH_ADDRESS_LENGTH;
             }

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltPt-win.c

@@ -996 +996 @@
                 NdisQueryBufferSafe(pBuffer, &pVA, &cbLength, NormalPagePriority);
 
-                fFlags = MACS_EQUAL(((PRTNETETHERHDR)pVA)->SrcMac, pNetFltIf->u.s.Mac) ?
+                fFlags = MACS_EQUAL(((PRTNETETHERHDR)pVA)->SrcMac, pNetFltIf->u.s.MacAddr) ?
                                                 PACKET_MINE | PACKET_SRC_HOST : PACKET_MINE;
                 SET_FLAGS_TO_INFO(pInfo, fFlags);
@@ -1381 +1381 @@
 #ifdef VBOX_NETFLT_ONDEMAND_BIND
                 {
-                    uint32_t fFlags = MACS_EQUAL(((PRTNETETHERHDR)pRcvData)->SrcMac, pNetFlt->u.s.Mac) ?
+                    uint32_t fFlags = MACS_EQUAL(((PRTNETETHERHDR)pRcvData)->SrcMac, pNetFlt->u.s.MacAddr) ?
                             PACKET_SG | PACKET_MINE | PACKET_SRC_HOST : PACKET_SG | PACKET_MINE;
                     Status = vboxNetFltWinQuEnqueuePacket(pNetFlt, pSG, fFlags);
@@ -1572 +1572 @@
                 }
 
-                fFlags = MACS_EQUAL(((PRTNETETHERHDR)pHeaderBuffer)->SrcMac, pNetFltIf->u.s.Mac) ?
+                fFlags = MACS_EQUAL(((PRTNETETHERHDR)pHeaderBuffer)->SrcMac, pNetFltIf->u.s.MacAddr) ?
                         PACKET_COPY | PACKET_SRC_HOST : PACKET_COPY;
                 Status = vboxNetFltWinQuEnqueuePacket(pNetFltIf, pPacket, fFlags);
@@ -1912 +1912 @@
             }
 
-            fFlags = MACS_EQUAL(((PRTNETETHERHDR)pVA)->SrcMac, pNetFltIf->u.s.Mac) ? PACKET_SRC_HOST : 0;
+            fFlags = MACS_EQUAL(((PRTNETETHERHDR)pVA)->SrcMac, pNetFltIf->u.s.MacAddr) ? PACKET_SRC_HOST : 0;
 
             Status = vboxNetFltWinQuEnqueuePacket(pNetFltIf, pPacket, bResources ? fFlags | PACKET_COPY : fFlags);