Changeset 28338 in vbox

Timestamp:

Apr 14, 2010 10:13:58 PM (15 years ago)

Author:

vboxsync

Message:

Windows linking fixes.

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (1 diff)
• Devices/Network/DevE1000.cpp (modified) (2 diffs)
• VMM/VMMR0/VMMR0.def (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -764 +764 @@
 
 if1of ($(VBOX_LDR_FMT), pe lx)
-VBoxDDR0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
+VBoxDDR0_LIBS           = \
+        $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
+        $(PATH_LIB)/SUP0$(VBOX_SUFF_LIB)
 endif
 

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

@@ -1992 +1992 @@
 static int e1kHandleRxPacket(E1KSTATE* pState, const void *pvBuf, size_t cb, E1KRXDST status)
 {
+#if defined(IN_RING3) /** @todo Remove this extra copying, it's gonna make us run out of kernel / hypervisor stack! */
     uint8_t   rxPacket[E1K_MAX_RX_PKT_SIZE];
     uint8_t  *ptr = rxPacket;
@@ -2111 +2112 @@
 
     return VINF_SUCCESS;
+#else
+    return VERR_INTERNAL_ERROR_2;
+#endif
 }
 

trunk/src/VBox/VMM/VMMR0/VMMR0.def

@@ -82 +82 @@
     memcpy=nocrt_memcpy                 ; not-os2
     nocrt_memset
+    memset=nocrt_memset                 ; not-os2
     nocrt_strcpy
     nocrt_strcmp