Changeset 13421 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Oct 21, 2008 9:26:26 AM (16 years ago)

Author:

vboxsync

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

38181

Message:

win64 VMMR0->VBoxNetFlt and VBoxNetFlt->VMMR0 locate/create marker call wrapping

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxNetFlt.c (modified) (10 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -37 +37 @@
 VBoxNetFlt_LDFLAGS.win.x86 = -Entry:DriverEntry@8
 VBoxNetFlt_LDFLAGS.win.amd64 = -Entry:DriverEntry
+VBoxNetFlt_SOURCES.win.amd64 += win/VBoxNetFltA-win.asm
+VBoxNetFlt_DEFS.win.amd64    += SUPDRV_WITH_UNWIND_HACK
 VBoxNetFlt_LIBS.win = \
         $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c

@@ -374 +374 @@
 }
 
+#ifdef SUPDRV_WITH_UNWIND_HACK
+# if defined(RT_OS_WINDOWS) && defined(RT_ARCH_AMD64)
+#  define NETFLT_DECL_CALLBACK(type) DECLASM(DECLHIDDEN(type))
+#  define NETFLT_CALLBACK(_n) netfltNtWrap##_n
+
+NETFLT_DECL_CALLBACK(int)  NETFLT_CALLBACK(vboxNetFltPortXmit)(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG, uint32_t fDst);
+NETFLT_DECL_CALLBACK(bool) NETFLT_CALLBACK(vboxNetFltPortIsPromiscuous)(PINTNETTRUNKIFPORT pIfPort);
+NETFLT_DECL_CALLBACK(void) NETFLT_CALLBACK(vboxNetFltPortGetMacAddress)(PINTNETTRUNKIFPORT pIfPort, PRTMAC pMac);
+NETFLT_DECL_CALLBACK(bool) NETFLT_CALLBACK(vboxNetFltPortIsHostMac)(PINTNETTRUNKIFPORT pIfPort, PCRTMAC pMac);
+NETFLT_DECL_CALLBACK(int)  NETFLT_CALLBACK(vboxNetFltPortWaitForIdle)(PINTNETTRUNKIFPORT pIfPort, uint32_t cMillies);
+NETFLT_DECL_CALLBACK(bool) NETFLT_CALLBACK(vboxNetFltPortSetActive)(PINTNETTRUNKIFPORT pIfPort, bool fActive);
+NETFLT_DECL_CALLBACK(void) NETFLT_CALLBACK(vboxNetFltPortDisconnectAndRelease)(PINTNETTRUNKIFPORT pIfPort);
+NETFLT_DECL_CALLBACK(void) NETFLT_CALLBACK(vboxNetFltPortRetain)(PINTNETTRUNKIFPORT pIfPort);
+NETFLT_DECL_CALLBACK(void) NETFLT_CALLBACK(vboxNetFltPortRelease)(PINTNETTRUNKIFPORT pIfPort);
+
+# else
+#  error "UNSUPPORTED (SUPDRV_WITH_UNWIND_HACK)"
+# endif
+#else
+# define NETFLT_DECL_CALLBACK(type) static DECLCALLBACK(type)
+# define NETFLT_CALLBACK(_n) _n
+#endif
 
 /**
  * @copydoc INTNETTRUNKIFPORT::pfnXmit
  */
-static DECLCALLBACK(int) vboxNetFltPortXmit(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG, uint32_t fDst)
+NETFLT_DECL_CALLBACK(int) vboxNetFltPortXmit(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG, uint32_t fDst)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -409 +431 @@
  * @copydoc INTNETTRUNKIFPORT::pfnIsPromiscuous
  */
-static DECLCALLBACK(bool) vboxNetFltPortIsPromiscuous(PINTNETTRUNKIFPORT pIfPort)
+NETFLT_DECL_CALLBACK(bool) vboxNetFltPortIsPromiscuous(PINTNETTRUNKIFPORT pIfPort)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -431 +453 @@
  * @copydoc INTNETTRUNKIFPORT::pfnGetMacAddress
  */
-static DECLCALLBACK(void) vboxNetFltPortGetMacAddress(PINTNETTRUNKIFPORT pIfPort, PRTMAC pMac)
+NETFLT_DECL_CALLBACK(void) vboxNetFltPortGetMacAddress(PINTNETTRUNKIFPORT pIfPort, PRTMAC pMac)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -453 +475 @@
  * @copydoc INTNETTRUNKIFPORT::pfnIsHostMac
  */
-static DECLCALLBACK(bool) vboxNetFltPortIsHostMac(PINTNETTRUNKIFPORT pIfPort, PCRTMAC pMac)
+NETFLT_DECL_CALLBACK(bool) vboxNetFltPortIsHostMac(PINTNETTRUNKIFPORT pIfPort, PCRTMAC pMac)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -475 +497 @@
  * @copydoc INTNETTRUNKIFPORT::pfnWaitForIdle
  */
-static DECLCALLBACK(int) vboxNetFltPortWaitForIdle(PINTNETTRUNKIFPORT pIfPort, uint32_t cMillies)
+NETFLT_DECL_CALLBACK(int) vboxNetFltPortWaitForIdle(PINTNETTRUNKIFPORT pIfPort, uint32_t cMillies)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -506 +528 @@
  * @copydoc INTNETTRUNKIFPORT::pfnSetActive
  */
-static DECLCALLBACK(bool) vboxNetFltPortSetActive(PINTNETTRUNKIFPORT pIfPort, bool fActive)
+NETFLT_DECL_CALLBACK(bool) vboxNetFltPortSetActive(PINTNETTRUNKIFPORT pIfPort, bool fActive)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -541 +563 @@
  * @copydoc INTNETTRUNKIFPORT::pfnDisconnectAndRelease
  */
-static DECLCALLBACK(void) vboxNetFltPortDisconnectAndRelease(PINTNETTRUNKIFPORT pIfPort)
+NETFLT_DECL_CALLBACK(void) vboxNetFltPortDisconnectAndRelease(PINTNETTRUNKIFPORT pIfPort)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -684 +706 @@
  * @copydoc INTNETTRUNKIFPORT::pfnRetain
  */
-static DECLCALLBACK(void) vboxNetFltPortRelease(PINTNETTRUNKIFPORT pIfPort)
+NETFLT_DECL_CALLBACK(void) vboxNetFltPortRelease(PINTNETTRUNKIFPORT pIfPort)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -736 +758 @@
  * @copydoc INTNETTRUNKIFPORT::pfnRetain
  */
-static DECLCALLBACK(void) vboxNetFltPortRetain(PINTNETTRUNKIFPORT pIfPort)
+NETFLT_DECL_CALLBACK(void) vboxNetFltPortRetain(PINTNETTRUNKIFPORT pIfPort)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -814 +836 @@
     pNew->pNext                         = NULL;
     pNew->MyPort.u32Version             = INTNETTRUNKIFPORT_VERSION;
-    pNew->MyPort.pfnRetain              = vboxNetFltPortRetain;
-    pNew->MyPort.pfnRelease             = vboxNetFltPortRelease;
-    pNew->MyPort.pfnDisconnectAndRelease= vboxNetFltPortDisconnectAndRelease;
-    pNew->MyPort.pfnSetActive           = vboxNetFltPortSetActive;
-    pNew->MyPort.pfnWaitForIdle         = vboxNetFltPortWaitForIdle;
-    pNew->MyPort.pfnGetMacAddress       = vboxNetFltPortGetMacAddress;
-    pNew->MyPort.pfnIsHostMac           = vboxNetFltPortIsHostMac;
-    pNew->MyPort.pfnIsPromiscuous       = vboxNetFltPortIsPromiscuous;
-    pNew->MyPort.pfnXmit                = vboxNetFltPortXmit;
+    pNew->MyPort.pfnRetain              = NETFLT_CALLBACK(vboxNetFltPortRetain);
+    pNew->MyPort.pfnRelease             = NETFLT_CALLBACK(vboxNetFltPortRelease);
+    pNew->MyPort.pfnDisconnectAndRelease= NETFLT_CALLBACK(vboxNetFltPortDisconnectAndRelease);
+    pNew->MyPort.pfnSetActive           = NETFLT_CALLBACK(vboxNetFltPortSetActive);
+    pNew->MyPort.pfnWaitForIdle         = NETFLT_CALLBACK(vboxNetFltPortWaitForIdle);
+    pNew->MyPort.pfnGetMacAddress       = NETFLT_CALLBACK(vboxNetFltPortGetMacAddress);
+    pNew->MyPort.pfnIsHostMac           = NETFLT_CALLBACK(vboxNetFltPortIsHostMac);
+    pNew->MyPort.pfnIsPromiscuous       = NETFLT_CALLBACK(vboxNetFltPortIsPromiscuous);
+    pNew->MyPort.pfnXmit                = NETFLT_CALLBACK(vboxNetFltPortXmit);
     pNew->MyPort.u32VersionEnd          = INTNETTRUNKIFPORT_VERSION;
     pNew->pSwitchPort                   = NULL;