Changeset 13421 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 21, 2008 9:26:26 AM (17 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/Devices

Files:

• Makefile.kmk (modified) (2 diffs)
• Network/SrvIntNetR0.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -765 +765 @@
         Serial/DrvHostSerial.cpp
 
-if defined(VBOX_WITH_NETFLT) && "$(KBUILD_TARGET)" == "win"
+if defined(VBOX_WITH_NETFLT)
  if defined(VBOX_NETFLT_ONDEMAND_BIND)
-  Drivers_DEFS.win += VBOX_NETFLT_ONDEMAND_BIND
- else
-  Drivers_SOURCES.win += Network/win/DrvIntNet-win.cpp
- endif
+  Drivers_DEFS.win     += VBOX_NETFLT_ONDEMAND_BIND
+ endif
+ Drivers_SOURCES.win   += Network/win/DrvIntNet-win.cpp
 endif
 
@@ -877 +876 @@
 ServicesR0_SOURCES   = \
         Network/SrvIntNetR0.cpp
+
+if defined(VBOX_WITH_NETFLT)
+ ServicesR0_SOURCES.win.amd64 += Network/win/SrvIntNetR0A-win.asm
+ ServicesR0_DEFS.win.amd64    += SUPDRV_WITH_UNWIND_HACK
+endif
+
 
 #

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -3301 +3301 @@
 
 
-
-
+#ifdef SUPDRV_WITH_UNWIND_HACK
+# if defined(RT_OS_WINDOWS) && defined(RT_ARCH_AMD64)
+#  define INTNET_DECL_CALLBACK(type) DECLASM(DECLHIDDEN(type))
+#  define INTNET_CALLBACK(_n) intnetNtWrap##_n
+
+   /* wrapper callback declarations */
+   INTNET_DECL_CALLBACK(bool) INTNET_CALLBACK(intnetR0TrunkIfPortSetSGPhys)(PINTNETTRUNKSWPORT pSwitchPort, bool fEnable);
+   INTNET_DECL_CALLBACK(bool) INTNET_CALLBACK(intnetR0TrunkIfPortRecv)(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG, uint32_t fSrc);
+   INTNET_DECL_CALLBACK(void) INTNET_CALLBACK(intnetR0TrunkIfPortSGRetain)(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG);
+   INTNET_DECL_CALLBACK(void) INTNET_CALLBACK(intnetR0TrunkIfPortSGRelease)(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG);
+
+# else
+#  error "UNSUPPORTED (SUPDRV_WITH_UNWIND_HACK)"
+# endif
+#else
+#  define INTNET_DECL_CALLBACK(_t) static DECLCALLBACK(_t)
+#  define INTNET_CALLBACK(_n) _n
+#endif
 
 /** @copydoc INTNETTRUNKSWPORT::pfnSetSGPhys */
-static DECLCALLBACK(bool) intnetR0TrunkIfPortSetSGPhys(PINTNETTRUNKSWPORT pSwitchPort, bool fEnable)
+INTNET_DECL_CALLBACK(bool) intnetR0TrunkIfPortSetSGPhys(PINTNETTRUNKSWPORT pSwitchPort, bool fEnable)
 {
     PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
@@ -3314 +3330 @@
 
 /** @copydoc INTNETTRUNKSWPORT::pfnRecv */
-static DECLCALLBACK(bool) intnetR0TrunkIfPortRecv(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG, uint32_t fSrc)
+INTNET_DECL_CALLBACK(bool) intnetR0TrunkIfPortRecv(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG, uint32_t fSrc)
 {
     PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
@@ -3345 +3361 @@
 
 /** @copydoc INTNETTRUNKSWPORT::pfnSGRetain */
-static DECLCALLBACK(void) intnetR0TrunkIfPortSGRetain(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG)
+INTNET_DECL_CALLBACK(void) intnetR0TrunkIfPortSGRetain(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG)
 {
     PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
@@ -3362 +3378 @@
 
 /** @copydoc INTNETTRUNKSWPORT::pfnSGRelease */
-static DECLCALLBACK(void) intnetR0TrunkIfPortSGRelease(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG)
+INTNET_DECL_CALLBACK(void) intnetR0TrunkIfPortSGRelease(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG)
 {
     PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
@@ -3592 +3608 @@
         return VERR_NO_MEMORY;
     pTrunkIF->SwitchPort.u32Version     = INTNETTRUNKSWPORT_VERSION;
-    pTrunkIF->SwitchPort.pfnSetSGPhys   = intnetR0TrunkIfPortSetSGPhys;
-    pTrunkIF->SwitchPort.pfnRecv        = intnetR0TrunkIfPortRecv;
-    pTrunkIF->SwitchPort.pfnSGRetain    = intnetR0TrunkIfPortSGRetain;
-    pTrunkIF->SwitchPort.pfnSGRelease   = intnetR0TrunkIfPortSGRelease;
+    pTrunkIF->SwitchPort.pfnSetSGPhys   = INTNET_CALLBACK(intnetR0TrunkIfPortSetSGPhys);
+    pTrunkIF->SwitchPort.pfnRecv        = INTNET_CALLBACK(intnetR0TrunkIfPortRecv);
+    pTrunkIF->SwitchPort.pfnSGRetain    = INTNET_CALLBACK(intnetR0TrunkIfPortSGRetain);
+    pTrunkIF->SwitchPort.pfnSGRelease   = INTNET_CALLBACK(intnetR0TrunkIfPortSGRelease);
     pTrunkIF->SwitchPort.u32VersionEnd  = INTNETTRUNKSWPORT_VERSION;
     //pTrunkIF->pIfPort = NULL;